[go: nahoru, domu]
Google Git
Sign in
android / platform / prebuilts / r8 / 8327350aa23e44cb54294df74ccaec4e2ac44511^1..8327350aa23e44cb54294df74ccaec4e2ac44511 / .
commit8327350aa23e44cb54294df74ccaec4e2ac44511[log] [tgz]
authorandroid-build-team Robot <android-build-team-robot@google.com>Fri Apr 23 01:09:47 2021 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>Fri Apr 23 01:09:47 2021 +0000
tree689dbcd7b88d752753254ef38f84233adad6952d
parent63c5c247ce7e99ac089708dfc98c6b2e50c641d7 [diff]
parentf480bc7224a700b0f7ac978f6aa6f9a9f33c56bc [diff]
Snap for 7306623 from f480bc7224a700b0f7ac978f6aa6f9a9f33c56bc to sc-release

Change-Id: I34c6292bfd46619ce19164b3bf16e5c43fdc2026

diff --git a/r8.jar b/r8.jar
index 3b6fe7f..0b3e107 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ

diff --git a/r8.jar.map b/r8.jar.map
index 8e530fc..0f9d22a 100644
--- a/r8.jar.map
+++ b/r8.jar.map

@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 3.0.34-dev
+# compiler_version: 3.0.36-dev
 # compiler_hash: engineering
-# pg_map_id: e82da64
+# pg_map_id: f60e5f4
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.l1:
     boolean $assertionsDisabled -> c
@@ -526,12 +526,12 @@
     18:23:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):174:179 -> a
     24:26:void lambda$run$4(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):203:205 -> a
     27:27:void lambda$run$5(java.lang.String):235:235 -> a
-    28:36:com.android.tools.r8.naming.ProguardMapSupplier finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):345:353 -> a
-    37:57:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):367:387 -> a
-    58:84:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):384:410 -> a
+    28:36:com.android.tools.r8.naming.ProguardMapSupplier finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):346:354 -> a
+    37:57:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):368:388 -> a
+    58:84:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):385:411 -> a
     85:85:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():193:193 -> a
-    85:85:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):410 -> a
-    86:86:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):418:418 -> a
+    85:85:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):411 -> a
+    86:86:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):419:419 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):126:126 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):164:166 -> c
     1:18:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):184:201 -> d
@@ -542,16 +542,16 @@
     95:98:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.RecordRewritingNamingLens.createRecordRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):30:33 -> d
     95:98:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):272 -> d
     99:103:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):274:278 -> d
-    104:104:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():476:476 -> d
+    104:104:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():479:479 -> d
     104:104:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):279 -> d
     105:126:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):279:300 -> d
     127:139:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):294:306 -> d
     140:144:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):303:307 -> d
-    145:178:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):283:316 -> d
-    179:202:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):315:338 -> d
-    203:203:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
-    203:203:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):333 -> d
-    204:209:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):333:338 -> d
+    145:179:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):283:317 -> d
+    180:203:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):316:339 -> d
+    204:204:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
+    204:204:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):334 -> d
+    205:210:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):334:339 -> d
     1:4:void main(java.lang.String[]):151:154 -> main
     5:5:void main(java.lang.String[]):152:152 -> main
     1:5:void run(com.android.tools.r8.D8Command):99:103 -> run
@@ -560,11 +560,11 @@
     11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):123:123 -> run
 com.android.tools.r8.D8$ConvertedCfFiles -> com.android.tools.r8.D8$a:
     java.util.List resources -> a
-    1:3:void <init>():433:435 -> <init>
-    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):441:443 -> accept
-    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):442:442 -> accept
-    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):441:441 -> accept
-    1:1:java.util.Collection getProgramResources():448:448 -> getProgramResources
+    1:3:void <init>():434:436 -> <init>
+    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):442:444 -> accept
+    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):443:443 -> accept
+    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):442:442 -> accept
+    1:1:java.util.Collection getProgramResources():449:449 -> getProgramResources
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> t
     boolean minimalMainDex -> y
@@ -769,16 +769,16 @@
     17:17:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):90 -> a
     18:18:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):97:97 -> a
     19:22:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:99 -> a
-    23:23:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):418:418 -> a
+    23:23:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):419:419 -> a
     23:23:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
     24:43:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):101:120 -> a
     44:44:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
     44:44:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115 -> a
     45:50:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115:120 -> a
-    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
     52:52:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     53:53:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
     54:71:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
     72:83:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:57 -> a
@@ -1428,53 +1428,53 @@
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>():40:40 -> <init>
     1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command):80:81 -> a
-    3:28:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:118 -> a
-    29:33:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):99:103 -> a
-    34:49:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):124:139 -> a
-    34:49:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    50:50:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):347:347 -> a
-    50:50:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
-    50:50:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    51:55:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:143 -> a
-    51:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    56:56:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25:25 -> a
-    56:56:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):143 -> a
-    56:56:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    57:60:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):30:33 -> a
-    57:60:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25 -> a
-    57:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):143 -> a
-    57:60:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    61:64:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144:147 -> a
-    61:64:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    65:65:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():476:476 -> a
-    65:65:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148 -> a
-    65:65:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    66:74:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148:156 -> a
-    66:74:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    75:77:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107:109 -> a
-    78:78:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    78:78:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151 -> a
-    78:78:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    79:84:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151:156 -> a
-    79:84:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):105 -> a
-    85:92:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164:171 -> a
-    93:94:void run(java.lang.String[]):175:176 -> a
-    93:94:void lambda$main$1(java.lang.String[]):197 -> a
-    95:95:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
-    95:95:void run(java.lang.String[]):177 -> a
-    95:95:void lambda$main$1(java.lang.String[]):197 -> a
-    96:96:void run(java.lang.String[]):178:178 -> a
-    96:96:void lambda$main$1(java.lang.String[]):197 -> a
-    97:97:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
-    97:97:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
-    97:97:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
-    97:97:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
-    97:97:void run(java.lang.String[]):177 -> a
-    97:97:void lambda$main$1(java.lang.String[]):197 -> a
-    98:102:void run(java.lang.String[]):181:185 -> a
-    98:102:void lambda$main$1(java.lang.String[]):197 -> a
-    1:4:void main(java.lang.String[]):194:197 -> main
-    5:5:void main(java.lang.String[]):195:195 -> main
+    3:31:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:121 -> a
+    32:38:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):99:105 -> a
+    39:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):127:142 -> a
+    39:54:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    55:55:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):347:347 -> a
+    55:55:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142 -> a
+    55:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    56:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142:146 -> a
+    56:60:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    61:61:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25:25 -> a
+    61:61:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146 -> a
+    61:61:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    62:65:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):30:33 -> a
+    62:65:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25 -> a
+    62:65:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146 -> a
+    62:65:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    66:69:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):147:150 -> a
+    66:69:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    70:70:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():479:479 -> a
+    70:70:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151 -> a
+    70:70:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    71:79:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151:159 -> a
+    71:79:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    80:83:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):109:112 -> a
+    84:84:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
+    84:84:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):154 -> a
+    84:84:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    85:90:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):154:159 -> a
+    85:90:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    91:98: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):167:174 -> a
+    99:100:void run(java.lang.String[]):178:179 -> a
+    99:100:void lambda$main$1(java.lang.String[]):200 -> a
+    101:101:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
+    101:101:void run(java.lang.String[]):180 -> a
+    101:101:void lambda$main$1(java.lang.String[]):200 -> a
+    102:102:void run(java.lang.String[]):181:181 -> a
+    102:102:void lambda$main$1(java.lang.String[]):200 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
+    103:103:void run(java.lang.String[]):180 -> a
+    103:103:void lambda$main$1(java.lang.String[]):200 -> a
+    104:108:void run(java.lang.String[]):184:188 -> a
+    104:108:void lambda$main$1(java.lang.String[]):200 -> a
+    1:4:void main(java.lang.String[]):197:200 -> main
+    5:5:void main(java.lang.String[]):198:198 -> main
     1:5:void run(com.android.tools.r8.L8Command):49:53 -> run
     6:6:void run(com.android.tools.r8.L8Command):48:48 -> run
     7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):65:69 -> run
@@ -1492,9 +1492,9 @@
     3:21:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,java.util.function.BiPredicate,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.graph.DexItemFactory):101:119 -> <init>
     22:26:void <init>(boolean,boolean):123:127 -> <init>
     1:48:com.android.tools.r8.utils.InternalOptions getInternalOptions():156:203 -> b
-    49:51:com.android.tools.r8.DumpOptions dumpOptions():431:433 -> b
-    49:51:com.android.tools.r8.utils.InternalOptions getInternalOptions():204 -> b
-    52:52:com.android.tools.r8.utils.InternalOptions getInternalOptions():204:204 -> b
+    49:54:com.android.tools.r8.DumpOptions dumpOptions():431:436 -> b
+    49:54:com.android.tools.r8.utils.InternalOptions getInternalOptions():204 -> b
+    55:55:com.android.tools.r8.utils.InternalOptions getInternalOptions():204:204 -> b
     1:1:com.android.tools.r8.L8Command$Builder builder():147:147 -> builder
     2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):151:151 -> builder
     1:1:com.android.tools.r8.D8Command getD8Command():50:50 -> f
@@ -1619,107 +1619,107 @@
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():165:165 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):171:176 -> <init>
+    1:1:void <clinit>():166:166 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):172:177 -> <init>
     boolean lambda$run$2(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexApplication lambda$run$4(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
-    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:209 -> a
-    2:11:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):222:231 -> a
-    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():476:476 -> a
-    12:12:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):232 -> a
-    13:26:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):232:245 -> a
-    27:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):251:252 -> a
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):210:210 -> a
+    2:11:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):223:232 -> a
+    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():479:479 -> a
+    12:12:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):233 -> a
+    13:26:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):233:246 -> a
+    27:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):252:253 -> a
     29:29:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
-    29:29:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):252 -> a
-    30:30:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):269:269 -> a
-    31:75:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):273:317 -> a
-    76:88:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):316:328 -> a
-    89:93:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):327:331 -> a
-    94:94:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):330:330 -> a
-    95:106:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):329:340 -> a
-    107:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):339:339 -> a
-    108:113:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):336:341 -> a
-    114:145:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):335:366 -> a
-    146:167:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):365:386 -> a
-    168:216:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):381:429 -> a
-    217:309:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):426:518 -> a
-    310:406:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):513:609 -> a
-    407:425:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):607:625 -> a
-    426:442:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):620:636 -> a
-    443:483:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):635:675 -> a
-    484:541:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):656:713 -> a
-    542:561:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):712:731 -> a
-    562:652:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):730:820 -> a
-    653:667:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):768:782 -> a
-    668:698:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):779:809 -> a
-    699:717:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):802:820 -> a
-    718:718:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):549:549 -> a
-    719:1133:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):406:820 -> a
-    1134:1134:void lambda$run$3(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):374:374 -> a
-    1135:1135:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):600:600 -> a
-    1136:1136:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$6(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):608:608 -> a
-    1137:1137:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):670:670 -> a
-    1138:1138:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):677:677 -> a
-    1139:1139:void lambda$run$10(java.lang.String):763:763 -> a
-    1140:1140:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):769:769 -> a
-    1141:1161:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):849:869 -> a
-    1162:1162:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):868:868 -> a
-    1163:1165:java.lang.Iterable lambda$performFinalMainDexTracing$13(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):871:873 -> a
-    1166:1168:void lambda$performFinalMainDexTracing$12(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):875:877 -> a
-    1169:1170:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):893:894 -> a
-    1171:1171:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):896:896 -> a
-    1172:1183:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):899:910 -> a
-    1184:1185:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):922:923 -> a
-    1184:1185:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):910 -> a
-    1186:1186:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    1186:1186:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):923 -> a
-    1186:1186:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):910 -> a
-    1187:1188:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):926:927 -> a
-    1187:1188:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):910 -> a
-    1189:1190:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):912:913 -> a
-    1191:1195:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):933:937 -> a
-    1191:1195:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):913 -> a
-    1196:1196:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
-    1196:1196:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):937 -> a
-    1196:1196:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):913 -> a
-    1197:1197:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):937:937 -> a
-    1197:1197:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):913 -> a
-    1198:1206: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):950:958 -> a
-    1207:1212: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):956:961 -> a
-    1213:1215:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):74:76 -> a
-    1213:1215: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):962 -> a
-    1216:1226: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):966:976 -> a
-    1227:1227:void lambda$runEnqueuer$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):974:974 -> a
-    1228:1230: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):995:997 -> a
-    1231:1265: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):996:1030 -> a
-    1266:1270: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):1027:1031 -> a
-    1271:1274:boolean verifyNoJarApplicationReaders(java.util.Collection):1035:1038 -> a
-    1275:1275:void lambda$run$18(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1060:1060 -> a
-    1276:1276:void lambda$main$19(java.lang.String[]):1075:1075 -> a
-    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):256:258 -> b
-    4:4:java.lang.Iterable lambda$run$7(com.android.tools.r8.graph.AppView):637:637 -> b
-    5:20:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):828:843 -> b
-    21:21:void lambda$runEnqueuer$17(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):978:978 -> b
-    22:23:void run(java.lang.String[]):1046:1047 -> b
+    29:29:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):253 -> a
+    30:30:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):270:270 -> a
+    31:76:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):274:319 -> a
+    77:89:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):318:330 -> a
+    90:94:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):329:333 -> a
+    95:95:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):332:332 -> a
+    96:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):331:342 -> a
+    108:108:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):341:341 -> a
+    109:114:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):338:343 -> a
+    115:146:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):337:368 -> a
+    147:168:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):367:388 -> a
+    169:217:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):383:431 -> a
+    218:310:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):428:520 -> a
+    311:407:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):515:611 -> a
+    408:426:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):609:627 -> a
+    427:443:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):622:638 -> a
+    444:484:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):637:677 -> a
+    485:542:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):658:715 -> a
+    543:562:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):714:733 -> a
+    563:653:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):732:822 -> a
+    654:668:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):770:784 -> a
+    669:699:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):781:811 -> a
+    700:718:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):804:822 -> a
+    719:719:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):551:551 -> a
+    720:1134:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):408:822 -> a
+    1135:1135:void lambda$run$3(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):376:376 -> a
+    1136:1136:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):602:602 -> a
+    1137:1137:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$6(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):610:610 -> a
+    1138:1138:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):672:672 -> a
+    1139:1139:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):679:679 -> a
+    1140:1140:void lambda$run$10(java.lang.String):765:765 -> a
+    1141:1141:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):771:771 -> a
+    1142:1162:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):851:871 -> a
+    1163:1163:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):870:870 -> a
+    1164:1166:java.lang.Iterable lambda$performFinalMainDexTracing$13(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):873:875 -> a
+    1167:1169:void lambda$performFinalMainDexTracing$12(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):877:879 -> a
+    1170:1171:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):895:896 -> a
+    1172:1172:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):898:898 -> a
+    1173:1184:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):901:912 -> a
+    1185:1186:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):924:925 -> a
+    1185:1186:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):912 -> a
+    1187:1187:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    1187:1187:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):925 -> a
+    1187:1187:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):912 -> a
+    1188:1189:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):928:929 -> a
+    1188:1189:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):912 -> a
+    1190:1191:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):914:915 -> a
+    1192:1196:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):935:939 -> a
+    1192:1196:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):915 -> a
+    1197:1197:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
+    1197:1197:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):939 -> a
+    1197:1197:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):915 -> a
+    1198:1198:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):939:939 -> a
+    1198:1198:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):915 -> a
+    1199:1207: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):952:960 -> a
+    1208:1213: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):958:963 -> a
+    1214:1216:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):74:76 -> a
+    1214:1216: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):964 -> a
+    1217:1227: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):968:978 -> a
+    1228:1228:void lambda$runEnqueuer$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):976:976 -> a
+    1229:1231: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):997:999 -> a
+    1232:1266: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):998:1032 -> a
+    1267:1271: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:1033 -> a
+    1272:1275:boolean verifyNoJarApplicationReaders(java.util.Collection):1037:1040 -> a
+    1276:1276:void lambda$run$18(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1062:1062 -> a
+    1277:1277:void lambda$main$19(java.lang.String[]):1077:1077 -> a
+    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):257:259 -> b
+    4:4:java.lang.Iterable lambda$run$7(com.android.tools.r8.graph.AppView):639:639 -> b
+    5:20:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):830:845 -> b
+    21:21:void lambda$runEnqueuer$17(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):980:980 -> b
+    22:23:void run(java.lang.String[]):1048:1049 -> b
     24:24:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    24:24:void run(java.lang.String[]):1048 -> b
-    25:25:void run(java.lang.String[]):1049:1049 -> b
+    24:24:void run(java.lang.String[]):1050 -> b
+    25:25:void run(java.lang.String[]):1051:1051 -> b
     26:26:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     26:26:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     26:26:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     26:26:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    26:26:void run(java.lang.String[]):1048 -> b
-    27:34:void run(java.lang.String[]):1052:1059 -> b
+    26:26:void run(java.lang.String[]):1050 -> b
+    27:34:void run(java.lang.String[]):1054:1061 -> b
     35:35:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
-    35:35:void run(java.lang.String[]):1059 -> b
-    36:36:void run(java.lang.String[]):1062:1062 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265:265 -> c
-    1:4:void main(java.lang.String[]):1072:1075 -> main
-    5:5:void main(java.lang.String[]):1073:1073 -> main
-    1:3:void run(com.android.tools.r8.R8Command):188:190 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):204:207 -> run
+    35:35:void run(java.lang.String[]):1061 -> b
+    36:36:void run(java.lang.String[]):1064:1064 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266:266 -> c
+    1:4:void main(java.lang.String[]):1074:1077 -> main
+    5:5:void main(java.lang.String[]):1075:1075 -> main
+    1:3:void run(com.android.tools.r8.R8Command):189:191 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):205:208 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):206 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):207 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     java.lang.String USAGE_MESSAGE -> K
     boolean skipDump -> J
@@ -1750,26 +1750,14 @@
     2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):693:693 -> a
     3:5:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):973:975 -> a
     1:29:com.android.tools.r8.utils.InternalOptions getInternalOptions():830:858 -> b
-    30:40:com.android.tools.r8.utils.InternalOptions getInternalOptions():857:867 -> b
-    41:41:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1181:1181 -> b
-    41:41:com.android.tools.r8.utils.InternalOptions getInternalOptions():867 -> b
-    42:51:com.android.tools.r8.utils.InternalOptions getInternalOptions():868:877 -> b
-    52:52:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1181:1181 -> b
-    52:52:com.android.tools.r8.utils.InternalOptions getInternalOptions():877 -> b
-    53:59:com.android.tools.r8.utils.InternalOptions getInternalOptions():878:884 -> b
-    60:60:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1181:1181 -> b
-    60:60:com.android.tools.r8.utils.InternalOptions getInternalOptions():884 -> b
-    61:65:com.android.tools.r8.utils.InternalOptions getInternalOptions():888:892 -> b
+    30:65:com.android.tools.r8.utils.InternalOptions getInternalOptions():857:892 -> b
     66:76:com.android.tools.r8.utils.InternalOptions getInternalOptions():889:899 -> b
     77:87:com.android.tools.r8.utils.InternalOptions getInternalOptions():896:906 -> b
     88:98:com.android.tools.r8.utils.InternalOptions getInternalOptions():903:913 -> b
-    99:131:com.android.tools.r8.utils.InternalOptions getInternalOptions():910:942 -> b
-    132:132:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1181:1181 -> b
-    132:132:com.android.tools.r8.utils.InternalOptions getInternalOptions():942 -> b
-    133:150:com.android.tools.r8.utils.InternalOptions getInternalOptions():946:963 -> b
-    151:162:com.android.tools.r8.DumpOptions dumpOptions():995:1006 -> b
-    151:162:com.android.tools.r8.utils.InternalOptions getInternalOptions():964 -> b
-    163:163:com.android.tools.r8.utils.InternalOptions getInternalOptions():964:964 -> b
+    99:152:com.android.tools.r8.utils.InternalOptions getInternalOptions():910:963 -> b
+    153:164:com.android.tools.r8.DumpOptions dumpOptions():995:1006 -> b
+    153:164:com.android.tools.r8.utils.InternalOptions getInternalOptions():964 -> b
+    165:165:com.android.tools.r8.utils.InternalOptions getInternalOptions():964:964 -> b
     1:1:com.android.tools.r8.R8Command$Builder builder():678:678 -> builder
     2:2:void com.android.tools.r8.R8Command$Builder.<init>():122:122 -> builder
     2:2:com.android.tools.r8.R8Command$Builder builder():678 -> builder
@@ -1848,7 +1836,7 @@
     1:4:com.android.tools.r8.R8Command makeCommand():466:469 -> q
     5:5:com.android.tools.r8.R8Command makeCommand():467:467 -> q
     1:16:com.android.tools.r8.R8Command makeR8Command():473:488 -> r
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():684:684 -> r
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():687:687 -> r
     17:17:com.android.tools.r8.R8Command makeR8Command():488 -> r
     18:79:com.android.tools.r8.R8Command makeR8Command():489:550 -> r
     80:80:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():516:516 -> r
@@ -2146,7 +2134,7 @@
     1:1:java.lang.String getPreReleaseString():86:86 -> getPreReleaseString
     1:1:java.lang.String getVersionString():21:21 -> getVersionString
     1:1:boolean isDevelopmentVersion():106:106 -> isDevelopmentVersion
-com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.lB:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.MB:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -2281,7 +2269,7 @@
     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.a4:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.Z3:
     java.util.Map knownTypeFields -> r
     java.util.Set imports -> j
     boolean pendingComma -> p
@@ -2413,7 +2401,7 @@
     1:1:java.util.List getMethods():102:102 -> f
     1:1:java.util.Set getSynthesizedTypes():588:588 -> g
     1:1:java.lang.String immutableListType():189:189 -> h
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.X4:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.W4:
     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
@@ -2546,7 +2534,7 @@
     35:35:void appendType(com.android.tools.r8.graph.DexType):728:728 -> b
     1:2:void newline():692:693 -> c
     1:1:java.lang.String toString():773:773 -> toString
-com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.X4$a:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.W4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> d
@@ -2555,7 +2543,7 @@
     2:2:void <clinit>():630:630 -> <clinit>
     3:3:void <clinit>():304:304 -> <clinit>
     4:4:void <clinit>():260:260 -> <clinit>
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.Z4:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.Y4:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -2659,14 +2647,13 @@
     10:19:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):368:377 -> b
     20:31:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):383:394 -> b
     1:1:int registersUsed():123:123 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.Y4:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.X4:
     java.util.List stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap registers -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List):71:73 -> <init>
     1:11:java.lang.String toString():78:88 -> toString
-com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.y5:
-    com.android.tools.r8.cf.CfVersion V1_1 -> b
-    com.android.tools.r8.cf.CfVersion V1_2 -> c
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.x5:
+    boolean $assertionsDisabled -> m
     com.android.tools.r8.cf.CfVersion V1_6 -> f
     com.android.tools.r8.cf.CfVersion V1_7 -> g
     com.android.tools.r8.cf.CfVersion V1_4 -> d
@@ -2676,21 +2663,27 @@
     com.android.tools.r8.cf.CfVersion V1_8 -> h
     int version -> a
     com.android.tools.r8.cf.CfVersion V9 -> i
-    1:15:void <clinit>():15:29 -> <clinit>
-    1:2:void <init>(int):34:35 -> <init>
-    1:1:int major():43:43 -> a
-    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):55:55 -> a
-    1:1:int minor():47:47 -> b
-    1:1:int raw():51:51 -> c
-    1:1:com.android.tools.r8.cf.CfVersion fromRaw(int):39:39 -> d
-    1:1:boolean equals(java.lang.Object):70:70 -> equals
-    1:1:int hashCode():75:75 -> hashCode
+    com.android.tools.r8.cf.CfVersion V1_1 -> b
+    com.android.tools.r8.cf.CfVersion[] versions -> l
+    com.android.tools.r8.cf.CfVersion V1_2 -> c
+    1:21:void <clinit>():15:35 -> <clinit>
+    1:2:void <init>(int):54:55 -> <init>
+    1:1:int major():63:63 -> a
+    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):75:75 -> a
+    3:3:boolean lambda$rangeInclusive$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):81:81 -> a
+    1:1:int minor():67:67 -> b
+    2:2:boolean lambda$rangeInclusive$1(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):82:82 -> b
+    1:1:int raw():71:71 -> c
+    2:6:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):79:83 -> c
+    1:1:com.android.tools.r8.cf.CfVersion fromRaw(int):59:59 -> d
+    1:1:boolean equals(java.lang.Object):98:98 -> equals
+    1:1:int hashCode():103:103 -> hashCode
     2:2:int com.android.tools.r8.utils.structural.HashCodeVisitor.run(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> hashCode
-    2:2:int hashCode():75 -> hashCode
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():65:65 -> k
+    2:2:int hashCode():103 -> hashCode
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():93:93 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
-    1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Rc:
+    1:1:java.lang.String toString():108:108 -> toString
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Sc:
     com.android.tools.r8.ir.code.Phi phi -> q
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> O
@@ -2700,7 +2693,7 @@
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> k0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.pp:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.Mp:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -2839,14 +2832,14 @@
     89:91:void com.android.tools.r8.cf.LoadStoreHelper.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator):287:289 -> b
     89:91:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):205 -> b
     92:94: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.np:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.Kp:
     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.op:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.Lp:
     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.IF:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.iG:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -2890,10 +2883,10 @@
     22:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     23:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     24:24:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):163:163 -> b
-com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.DF:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.dG:
     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.EF:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.eG:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2901,7 +2894,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.FF:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.fG:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2911,7 +2904,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.GF:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.gG:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -2922,24 +2915,24 @@
     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.HF:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.hG:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.L3:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.K3:
     com.android.tools.r8.ir.code.NumericType type -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> a
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():29:29 -> <clinit>
     1:5:void <init>(com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode,com.android.tools.r8.ir.code.NumericType):42:46 -> <init>
-    1:13:int getAsmOpcode():116:128 -> A
-    14:14:int getAsmOpcode():126:126 -> A
-    15:15:int getAsmOpcode():124:124 -> A
-    16:16:int getAsmOpcode():122:122 -> A
-    17:17:int getAsmOpcode():120:120 -> A
-    18:18:int getAsmOpcode():118:118 -> A
-    1:1:int getAsmOpcodeTypeOffset():133:133 -> B
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():61:61 -> C
-    1:1:com.android.tools.r8.ir.code.NumericType getType():65:65 -> D
+    1:13:int getAsmOpcode():116:128 -> B
+    14:14:int getAsmOpcode():126:126 -> B
+    15:15:int getAsmOpcode():124:124 -> B
+    16:16:int getAsmOpcode():122:122 -> B
+    17:17:int getAsmOpcode():120:120 -> B
+    18:18:int getAsmOpcode():118:118 -> B
+    1:1:int getAsmOpcodeTypeOffset():133:133 -> C
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():61:61 -> D
+    1:1:com.android.tools.r8.ir.code.NumericType getType():65:65 -> E
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):57:57 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):147:147 -> 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):160:160 -> a
@@ -2958,12 +2951,12 @@
     34:34:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):211:211 -> a
     1:1:boolean canThrow():165:165 -> n
     1:1:int getCompareToId():51:51 -> p
-com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.L3$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.K3$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfArithmeticBinop$Opcode -> a
     1:1:void <clinit>():133:133 -> <clinit>
     2:2:void <clinit>():116:116 -> <clinit>
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.L3$b:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.K3$b:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> f
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> a
@@ -2974,7 +2967,7 @@
     6:6:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] values():31:31 -> a
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.M3:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.L3:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -2990,13 +2983,13 @@
     12:12:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):85 -> a
     int getCompareToId() -> p
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.N3:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.M3:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.code.MemberType type -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.MemberType):34:36 -> <init>
-    1:19:int getLoadType():55:73 -> A
-    1:1:com.android.tools.r8.ir.code.MemberType getType():51:51 -> B
+    1:19:int getLoadType():55:73 -> B
+    1:1:com.android.tools.r8.ir.code.MemberType getType():51:51 -> C
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):87:87 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):92:92 -> a
@@ -3020,11 +3013,11 @@
     50:51:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):131:132 -> a
     boolean canThrow() -> n
     1:1:int getCompareToId():41:41 -> p
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.O3:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.N3:
     com.android.tools.r8.ir.code.MemberType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):33:34 -> <init>
-    1:19:int getStoreType():53:71 -> A
-    1:1:com.android.tools.r8.ir.code.MemberType getType():38:38 -> B
+    1:19:int getStoreType():53:71 -> B
+    1:1:com.android.tools.r8.ir.code.MemberType getType():38:38 -> C
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
     2:2: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):85:85 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):90:90 -> a
@@ -3035,9 +3028,10 @@
     10:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):121:123 -> a
     boolean canThrow() -> n
     1:1:int getCompareToId():43:43 -> p
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.S3:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.R3:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
+    boolean isTypeInstruction() -> A
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):54:54 -> 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):65:65 -> a
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
@@ -3054,18 +3048,17 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> m
     boolean canThrow() -> n
     int getCompareToId() -> p
-    boolean isTypeInstruction() -> z
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.Y3:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.X3:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
     1:8:void <init>(com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.NumericType):36:43 -> <init>
-    1:9:int getAsmOpcode():83:91 -> A
-    10:10:int getAsmOpcode():87:87 -> A
-    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():58:58 -> B
-    1:1:com.android.tools.r8.ir.code.NumericType getType():62:62 -> C
+    1:9:int getAsmOpcode():83:91 -> B
+    10:10:int getAsmOpcode():87:87 -> B
+    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():58:58 -> C
+    1:1:com.android.tools.r8.ir.code.NumericType getType():62:62 -> D
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54:54 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):97:97 -> 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):110:110 -> a
@@ -3080,12 +3073,13 @@
     12:12:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):136 -> a
     1:1:int getCompareToId():48:48 -> p
-com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.X3:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.W3:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():83:83 -> <clinit>
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.e4:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.d4:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
+    boolean isTypeInstruction() -> 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):45:45 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):45 -> a
@@ -3114,11 +3108,10 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> m
     boolean canThrow() -> n
     1:1:int getCompareToId():39:39 -> p
-    boolean isTypeInstruction() -> z
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.f4:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.e4:
     com.android.tools.r8.graph.DexMethodHandle handle -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():38:38 -> A
+    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():38:38 -> B
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
     2:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:65 -> a
     6:6:void print(com.android.tools.r8.cf.CfPrinter):70:70 -> a
@@ -3132,10 +3125,10 @@
     14:14:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):106 -> a
     boolean canThrow() -> n
     1:1:int getCompareToId():43:43 -> p
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.g4:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.f4:
     com.android.tools.r8.graph.DexProto type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProto):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getType():38:38 -> A
+    1:1:com.android.tools.r8.graph.DexProto getType():38:38 -> B
     1:1:com.android.tools.r8.graph.DexProto com.android.tools.r8.cf.code.CfConstMethodType.getType():38:38 -> a
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):62 -> a
     2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:63 -> a
@@ -3151,7 +3144,7 @@
     13:13:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):104 -> a
     boolean canThrow() -> n
     1:1:int getCompareToId():43:43 -> p
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.h4:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.g4:
     1:1:void <init>():26:26 -> <init>
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):38:38 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
@@ -3166,19 +3159,19 @@
     9:9:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     9:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):77 -> a
     int getCompareToId() -> p
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.i4:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.h4:
     com.android.tools.r8.ir.code.ValueType type -> b
     long value -> a
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(long,com.android.tools.r8.ir.code.ValueType):37:39 -> <init>
-    1:2:double getDoubleValue():77:78 -> A
-    1:2:float getFloatValue():72:73 -> B
-    1:2:int getIntValue():62:63 -> C
-    1:2:long getLongValue():67:68 -> D
-    1:1:long getRawValue():58:58 -> E
-    1:1:com.android.tools.r8.ir.code.ValueType getType():54:54 -> F
+    1:2:double getDoubleValue():77:78 -> B
+    1:2:float getFloatValue():72:73 -> C
+    1:2:int getIntValue():62:63 -> D
+    1:2:long getLongValue():67:68 -> E
+    1:1:long getRawValue():58:58 -> F
+    1:1:com.android.tools.r8.ir.code.ValueType getType():54:54 -> G
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):34:34 -> 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):50:50 -> a
     3:55: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):91:143 -> a
@@ -3204,16 +3197,16 @@
     98:98:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     98:98:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):180 -> a
     1:1:int getCompareToId():44:44 -> p
-com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.i4$a:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.h4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():91:91 -> <clinit>
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.j4:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.i4:
     com.android.tools.r8.graph.DexString string -> a
     1:2:void <init>(com.android.tools.r8.graph.DexString):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getString():45:45 -> A
+    1:1:com.android.tools.r8.graph.DexString getString():45:45 -> B
     com.android.tools.r8.cf.code.CfConstString asConstString() -> 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):41:41 -> a
-    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> 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):41 -> a
     3:3:void setString(com.android.tools.r8.graph.DexString):49:49 -> 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):72:72 -> a
@@ -3227,14 +3220,14 @@
     12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):107 -> a
     boolean canThrow() -> n
     1:1:int getCompareToId():35:35 -> p
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.k4:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.j4:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> b
     com.android.tools.r8.graph.DexReference item -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():30:30 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):35:37 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():52:52 -> A
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():56:56 -> B
+    1:1:com.android.tools.r8.graph.DexReference getItem():52:52 -> B
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():56:56 -> C
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
     2:2: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):79:79 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):85:85 -> a
@@ -3254,16 +3247,16 @@
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> c
     boolean canThrow() -> n
     1:1:int getCompareToId():42:42 -> p
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.l4:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.k4:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.graph.DexField declaringField -> c
     int opcode -> a
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():34:34 -> <clinit>
     1:5:void <init>(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):44:48 -> <init>
-    1:1:com.android.tools.r8.graph.DexField getField():52:52 -> A
-    1:1:int getOpcode():56:56 -> B
-    1:1:boolean isFieldGet():71:71 -> C
+    1:1:com.android.tools.r8.graph.DexField getField():52:52 -> B
+    1:1:int getOpcode():56:56 -> C
+    1:1:boolean isFieldGet():71:71 -> D
     1:1:int lambda$specify$0(com.android.tools.r8.cf.code.CfFieldInstruction):41:41 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):41:41 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):67:67 -> a
@@ -3299,15 +3292,15 @@
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> d
     boolean canThrow() -> n
     1:1:int getCompareToId():61:61 -> p
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.n4:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.m4:
     java.util.Deque stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():36:36 -> <clinit>
     1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):338:342 -> <init>
-    1:2:int computeStackSize():376:377 -> A
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():346:346 -> B
-    1:1:java.util.Deque getStack():350:350 -> C
+    1:2:int computeStackSize():376:377 -> B
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():346:346 -> C
+    1:1:java.util.Deque getStack():350:350 -> D
     1:1:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame markInstantiated(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):467 -> a
     2:10:com.android.tools.r8.cf.code.CfFrame markInstantiated(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):471:479 -> a
@@ -3343,8 +3336,8 @@
     com.android.tools.r8.cf.code.CfFrame asFrame() -> e
     1:1:int getCompareToId():152:152 -> p
     1:1:java.lang.String toString():432:432 -> toString
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.m4:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.n4$a:
+com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.l4:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.m4$a:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):38:38 -> <init>
     2:2:void <init>():106:106 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -3373,7 +3366,7 @@
     boolean isWide() -> h
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():53:53 -> i
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():49:49 -> j
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.o4:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.n4:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():163:163 -> <clinit>
@@ -3385,28 +3378,28 @@
     28:28:com.android.tools.r8.graph.DexType getInitializedType():211:211 -> a
     1:1:boolean isWide():201:201 -> h
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.o4:
     com.android.tools.r8.cf.code.CfFrame$OneWord SINGLETON -> a
     1:1:void <clinit>():292:292 -> <clinit>
     1:1:void <init>():290:290 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):296:296 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$OneWord access$400():290:290 -> k
     1:1:java.lang.String toString():306:306 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.q4:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.p4:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
     1:1:void <clinit>():217:217 -> <clinit>
     1:1:void <init>():215:215 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):226:226 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():215:215 -> k
     1:1:java.lang.String toString():221:221 -> toString
-com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.r4:
+com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.q4:
     com.android.tools.r8.cf.code.CfFrame$TwoWord SINGLETON -> a
     1:1:void <clinit>():312:312 -> <clinit>
     1:1:void <init>():310:310 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):316:316 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$TwoWord access$500():310:310 -> k
     1:1:java.lang.String toString():331:331 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.s4:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.r4:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.graph.DexType type -> b
     1:1:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):235:235 -> <init>
@@ -3415,12 +3408,12 @@
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():261:261 -> b
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():266:266 -> c
     1:1:java.lang.String toString():246:246 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.t4:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.s4:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):270:270 -> <init>
     2:2:void <init>():272:272 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):276:276 -> a
     1:1:java.lang.String toString():281:281 -> toString
-com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.u4:
+com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.t4:
     java.util.Map stateMap -> d
     com.android.tools.r8.graph.GraphLens graphLens -> g
     java.util.Set tryCatchRangeLabels -> j
@@ -3541,7 +3534,7 @@
     8:8:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):258 -> c
     9:9:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):261:261 -> c
     1:1:void setNoFrame():254:254 -> d
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.v4:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.u4:
     com.android.tools.r8.cf.code.CfLabel target -> a
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):29:30 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):41:41 -> a
@@ -3556,18 +3549,18 @@
     8:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):100:101 -> a
     int getCompareToId() -> p
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():61:61 -> q
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.w4:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.v4:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():29:29 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):35:38 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():60:60 -> A
-    1:15:int getOpcode():69:83 -> B
-    16:16:int getOpcode():81:81 -> B
-    17:17:int getOpcode():71:71 -> B
-    1:1:com.android.tools.r8.ir.code.ValueType getType():56:56 -> C
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():60:60 -> B
+    1:15:int getOpcode():69:83 -> C
+    16:16:int getOpcode():81:81 -> C
+    17:17:int getOpcode():71:71 -> C
+    1:1:com.android.tools.r8.ir.code.ValueType getType():56:56 -> D
     1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:52 -> a
     5:5:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):76:76 -> 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):52 -> a
@@ -3581,22 +3574,22 @@
     18:18:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):140:140 -> a
     1:1:int getCompareToId():43:43 -> p
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():65:65 -> q
-    boolean isJump() -> x
-com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.w4$a:
+    boolean isJump() -> y
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.v4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():69:69 -> <clinit>
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.x4:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.w4:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():29:29 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):35:38 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():56:56 -> A
-    1:15:int getOpcode():69:83 -> B
-    16:16:int getOpcode():81:81 -> B
-    17:17:int getOpcode():71:71 -> B
-    1:1:com.android.tools.r8.ir.code.ValueType getType():60:60 -> C
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():56:56 -> B
+    1:15:int getOpcode():69:83 -> C
+    16:16:int getOpcode():81:81 -> C
+    17:17:int getOpcode():71:71 -> C
+    1:1:com.android.tools.r8.ir.code.ValueType getType():60:60 -> D
     1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:52 -> a
     5:5:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):76:76 -> 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):52 -> a
@@ -3614,16 +3607,16 @@
     1:1:int getCompareToId():43:43 -> p
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():65:65 -> q
     boolean isConditionalJump() -> r
-    boolean isJump() -> x
-com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.x4$a:
+    boolean isJump() -> y
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.w4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():69:69 -> <clinit>
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.y4:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.x4:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):36:38 -> <init>
-    1:1:int getIncrement():75:75 -> A
-    1:1:int getLocalIndex():71:71 -> B
+    1:1:int getIncrement():75:75 -> B
+    1:1:int getLocalIndex():71:71 -> C
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):33:33 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
     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):62:62 -> a
@@ -3632,10 +3625,10 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):87:87 -> a
     8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):97:97 -> a
     int getCompareToId() -> p
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.z4:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.y4:
     com.android.tools.r8.graph.DexType clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getClassValue():39:39 -> A
+    1:1:com.android.tools.r8.graph.DexType getClassValue():39:39 -> B
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54:54 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54 -> a
@@ -3649,9 +3642,10 @@
     15:15:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):119 -> a
     boolean canThrow() -> n
     1:1:int getCompareToId():48:48 -> p
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.A4:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.z4:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):32:33 -> <init>
+    boolean isTypeInstruction() -> A
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):53:53 -> 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):64:64 -> a
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
@@ -3670,9 +3664,9 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> m
     boolean canThrow() -> n
     int getCompareToId() -> p
-    boolean isTypeInstruction() -> z
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.B4:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.A4:
     1:1:void <init>():29:29 -> <init>
+    boolean isTypeInstruction() -> A
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
@@ -3706,20 +3700,19 @@
     boolean isInvokeInterface() -> u
     boolean isInvokeSpecial() -> v
     boolean isInvokeStatic() -> w
-    boolean isJump() -> x
-    boolean isReturn() -> y
-    boolean isTypeInstruction() -> z
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.G4:
+    boolean isInvokeVirtual() -> x
+    boolean isJump() -> y
+    boolean isReturn() -> z
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.F4:
     int opcode -> b
     com.android.tools.r8.graph.DexMethod method -> a
     boolean itf -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():43:43 -> <clinit>
     1:7:void <init>(int,com.android.tools.r8.graph.DexMethod,boolean):53:59 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():75:75 -> A
-    1:1:int getOpcode():79:79 -> B
-    1:1:boolean isInterface():83:83 -> C
-    1:1:boolean isInvokeVirtual():189:189 -> D
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():75:75 -> B
+    1:1:int getOpcode():79:79 -> C
+    1:1:boolean isInterface():83:83 -> D
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):50:50 -> a
     2:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):70:71 -> a
     4:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106:112 -> a
@@ -3735,46 +3728,47 @@
     69:73:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):154:158 -> a
     74:74:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):156:156 -> a
     75:75:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):151:151 -> a
-    76:126:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):207:257 -> a
-    127:170:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):210:253 -> a
-    171:175:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):240:244 -> a
-    176:185:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):381:390 -> a
-    176:185:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):244 -> a
-    186:188:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.cf.code.CfInvoke.lookupMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):417:419 -> a
-    186:188:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):391 -> a
-    186:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):244 -> a
-    189:205:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):395:411 -> a
-    189:205:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):244 -> a
+    76:126:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):208:258 -> a
+    127:170:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):211:254 -> a
+    171:175:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):241:245 -> a
+    176:185:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):382:391 -> a
+    176:185:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):245 -> a
+    186:188:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.cf.code.CfInvoke.lookupMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):418:420 -> a
+    186:188:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):392 -> a
+    186:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):245 -> a
+    189:205:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):396:412 -> a
+    189:205:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):245 -> a
     206:206:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    206:206:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):411 -> a
-    206:206:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):244 -> a
-    207:207:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):411:411 -> a
-    207:207:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):244 -> a
-    208:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):246:246 -> a
-    209:264:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):216:271 -> a
-    265:268:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):270:273 -> a
-    269:333:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):280:344 -> a
-    334:365:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):289:320 -> a
-    366:419:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):294:347 -> a
-    420:421:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):362:363 -> a
+    206:206:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):412 -> a
+    206:206:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):245 -> a
+    207:207:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):412:412 -> a
+    207:207:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):245 -> a
+    208:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):247:247 -> a
+    209:264:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):217:272 -> a
+    265:268:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):271:274 -> a
+    269:333:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):281:345 -> a
+    334:365:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):290:321 -> a
+    366:419:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):295:348 -> a
+    420:421:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):363:364 -> a
     422:422:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):275:275 -> a
-    422:422:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):363 -> a
-    423:427:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):364:368 -> a
+    422:422:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):364 -> a
+    423:427:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):365:369 -> a
     428:428:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
-    428:428:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):369 -> a
-    429:429:boolean noNeedToUseGraphLens(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):375:375 -> a
+    428:428:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):370 -> a
+    429:429:boolean noNeedToUseGraphLens(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):376:376 -> a
     1:3:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):173:175 -> b
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> g
     boolean canThrow() -> n
     1:1:int getCompareToId():64:64 -> p
     boolean isInvoke() -> t
-    1:1:boolean isInvokeInterface():194:194 -> u
+    1:1:boolean isInvokeInterface():195:195 -> u
     1:1:boolean isInvokeSpecial():180:180 -> v
     1:1:boolean isInvokeStatic():185:185 -> w
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.H4:
+    1:1:boolean isInvokeVirtual():190:190 -> x
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.G4:
     com.android.tools.r8.graph.DexCallSite callSite -> a
     1:2:void <init>(com.android.tools.r8.graph.DexCallSite):42:43 -> <init>
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():124:124 -> A
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():124:124 -> B
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):64:64 -> a
     2:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:82 -> a
     8:28:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):94:114 -> a
@@ -3806,14 +3800,14 @@
     com.android.tools.r8.cf.code.CfInvokeDynamic asInvokeDynamic() -> h
     boolean canThrow() -> n
     int getCompareToId() -> p
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.I4:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.H4:
     int local -> a
     1:2:void <init>(int):35:36 -> <init>
-    1:1:com.android.tools.r8.errors.CompilationError error():29:29 -> A
-    2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> A
-    2:2:com.android.tools.r8.errors.CompilationError error():29 -> A
-    3:3:com.android.tools.r8.errors.CompilationError error():29:29 -> A
-    1:1:int getLocal():92:92 -> B
+    1:1:com.android.tools.r8.errors.CompilationError error():29:29 -> B
+    2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> B
+    2:2:com.android.tools.r8.errors.CompilationError error():29 -> B
+    3:3:com.android.tools.r8.errors.CompilationError error():29:29 -> B
+    1:1:int getLocal():92:92 -> C
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60:60 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
@@ -3821,10 +3815,10 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):76:76 -> a
     6:6:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):88:88 -> a
     1:1:int getCompareToId():41:41 -> p
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.J4:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.I4:
     com.android.tools.r8.org.objectweb.asm.Label label -> a
     1:3:void <init>():25:27 -> <init>
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():30:33 -> A
+    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():30:33 -> B
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):44:44 -> a
@@ -3836,13 +3830,13 @@
     com.android.tools.r8.cf.code.CfLabel asLabel() -> i
     boolean emitsIR() -> o
     1:1:int getCompareToId():38:38 -> p
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.K4:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.J4:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):33:35 -> <init>
-    1:13:int getLoadType():50:62 -> A
-    1:1:int getLocalIndex():99:99 -> B
-    1:1:com.android.tools.r8.ir.code.ValueType getType():95:95 -> C
+    1:13:int getLoadType():50:62 -> B
+    1:1:int getLocalIndex():99:99 -> C
+    1:1:com.android.tools.r8.ir.code.ValueType getType():95:95 -> D
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):86:86 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):91:91 -> a
@@ -3860,25 +3854,25 @@
     com.android.tools.r8.cf.code.CfLoad asLoad() -> j
     boolean emitsIR() -> o
     1:1:int getCompareToId():40:40 -> p
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.K4$a:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.J4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():50:50 -> <clinit>
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.L4:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.K4:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():29:29 -> <clinit>
     1:6:void <init>(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):43:48 -> <init>
-    1:15:int getAsmOpcode():102:116 -> A
-    16:16:int getAsmOpcode():114:114 -> A
-    17:17:int getAsmOpcode():112:112 -> A
-    18:18:int getAsmOpcode():110:110 -> A
-    19:19:int getAsmOpcode():108:108 -> A
-    20:20:int getAsmOpcode():106:106 -> A
-    21:21:int getAsmOpcode():104:104 -> A
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():67:67 -> B
-    1:1:com.android.tools.r8.ir.code.NumericType getType():63:63 -> C
+    1:15:int getAsmOpcode():102:116 -> B
+    16:16:int getAsmOpcode():114:114 -> B
+    17:17:int getAsmOpcode():112:112 -> B
+    18:18:int getAsmOpcode():110:110 -> B
+    19:19:int getAsmOpcode():108:108 -> B
+    20:20:int getAsmOpcode():106:106 -> B
+    21:21:int getAsmOpcode():104:104 -> B
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():67:67 -> C
+    1:1:com.android.tools.r8.ir.code.NumericType getType():63:63 -> D
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):59:59 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):122:122 -> 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):135:135 -> a
@@ -3897,7 +3891,7 @@
     37:37:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):182 -> a
     38:47:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):184:193 -> a
     1:1:int getCompareToId():53:53 -> p
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.L4$a:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.K4$a:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> d
@@ -3908,10 +3902,10 @@
     1:6:void <clinit>():32:37 -> <clinit>
     7:7:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.M4:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.L4:
     com.android.tools.r8.ir.code.Monitor$Type type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):32:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():37:37 -> A
+    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():37:37 -> B
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
     2:2:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():65:65 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):61 -> a
@@ -3927,13 +3921,14 @@
     boolean canThrow() -> n
     1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():65:65 -> p
     1:1:int getCompareToId():42 -> p
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.N4:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.M4:
     com.android.tools.r8.graph.DexType type -> a
     int dimensions -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():30:30 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):39:41 -> <init>
-    1:1:int getDimensions():65:65 -> A
+    boolean isTypeInstruction() -> A
+    1:1:int getDimensions():65:65 -> B
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):36:36 -> a
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfMultiANewArray.getType():56:56 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):89 -> a
@@ -3954,12 +3949,11 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> m
     boolean canThrow() -> n
     int getCompareToId() -> p
-    boolean isTypeInstruction() -> z
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.P4:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.O4:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):33:34 -> <init>
-    1:14:int getAsmOpcode():71:84 -> A
-    1:1:com.android.tools.r8.ir.code.NumericType getType():38:38 -> B
+    1:14:int getAsmOpcode():71:84 -> B
+    1:1:com.android.tools.r8.ir.code.NumericType getType():38:38 -> C
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):62:62 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):67:67 -> a
@@ -3972,12 +3966,13 @@
     9:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):124 -> a
     10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):125:125 -> a
     1:1:int getCompareToId():43:43 -> p
-com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.O4:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.N4:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():71:71 -> <clinit>
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.Q4:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.P4:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
+    boolean isTypeInstruction() -> A
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):54:54 -> 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):65:65 -> a
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
@@ -3992,12 +3987,12 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> m
     boolean canThrow() -> n
     int getCompareToId() -> p
-    boolean isTypeInstruction() -> z
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.R4:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.Q4:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexType):35:37 -> <init>
+    boolean isTypeInstruction() -> A
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):57:57 -> 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):68:68 -> a
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
@@ -4022,8 +4017,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> m
     boolean canThrow() -> n
     1:1:int getCompareToId():62:62 -> p
-    boolean isTypeInstruction() -> z
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.S4:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.R4:
     1:1:void <init>():25:25 -> <init>
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):35:35 -> a
@@ -4033,19 +4027,19 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):69:69 -> a
     boolean emitsIR() -> o
     int getCompareToId() -> p
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.U4:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.T4:
     com.android.tools.r8.ir.code.NumericType to -> b
     com.android.tools.r8.ir.code.NumericType from -> a
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():29:29 -> <clinit>
     1:7:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType):34:40 -> <init>
-    1:53:int getAsmOpcode():81:133 -> A
-    54:101:int getAsmOpcode():83:130 -> A
-    102:110:int getAsmOpcode():111:119 -> A
-    111:119:int getAsmOpcode():100:108 -> A
-    1:1:com.android.tools.r8.ir.code.NumericType getFromType():55:55 -> B
-    1:1:com.android.tools.r8.ir.code.NumericType getToType():59:59 -> C
+    1:53:int getAsmOpcode():81:133 -> B
+    54:101:int getAsmOpcode():83:130 -> B
+    102:110:int getAsmOpcode():111:119 -> B
+    111:119:int getAsmOpcode():100:108 -> B
+    1:1:com.android.tools.r8.ir.code.NumericType getFromType():55:55 -> C
+    1:1:com.android.tools.r8.ir.code.NumericType getToType():59:59 -> D
     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: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
     3:3:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
@@ -4061,15 +4055,15 @@
     11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):197 -> a
     12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):197:197 -> a
     1:1:int getCompareToId():45:45 -> p
-com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.T4:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.S4:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():83:83 -> <clinit>
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.W4:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.V4:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):32:34 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():76:76 -> A
-    1:1:com.android.tools.r8.ir.code.Position getPosition():72:72 -> B
+    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():76:76 -> B
+    1:1:com.android.tools.r8.ir.code.Position getPosition():72:72 -> C
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):45:45 -> a
     2:2:int lambda$internalAcceptCompareTo$0(com.android.tools.r8.cf.code.CfPosition):49:49 -> a
@@ -4084,13 +4078,13 @@
     com.android.tools.r8.cf.code.CfPosition asPosition() -> k
     boolean emitsIR() -> o
     1:1:int getCompareToId():39:39 -> p
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.a5:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.Z4:
     com.android.tools.r8.ir.code.ValueType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):32:33 -> <init>
-    1:13:int getOpcode():52:64 -> A
-    1:1:com.android.tools.r8.ir.code.ValueType getType():37:37 -> B
+    1:13:int getOpcode():52:64 -> B
+    1:1:com.android.tools.r8.ir.code.ValueType getType():37:37 -> C
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):83:83 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):88:88 -> a
@@ -4100,11 +4094,11 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):105 -> a
     8:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):115:117 -> a
     1:1:int getCompareToId():42:42 -> p
-    boolean isJump() -> x
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.a5$a:
+    boolean isJump() -> y
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.Z4$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():52:52 -> <clinit>
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.b5:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.a5:
     1:1:void <init>():25:25 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):40:40 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):53:53 -> a
@@ -4115,14 +4109,14 @@
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):79 -> a
     7:7:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):89:89 -> a
     int getCompareToId() -> p
-    boolean isJump() -> x
-    boolean isReturn() -> y
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.h5:
+    boolean isJump() -> y
+    boolean isReturn() -> z
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.g5:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():30:30 -> <clinit>
     1:2:void <init>(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):81:82 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():115:115 -> A
+    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():115:115 -> B
     1:1:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):73:73 -> a
     2:2:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):71:71 -> a
     3:3:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):69:69 -> a
@@ -4337,10 +4331,10 @@
     17:17: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):303 -> b
     boolean emitsIR() -> o
     1:1:int getCompareToId():87:87 -> p
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.h5$a:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.g5$a:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfStackInstruction$Opcode -> a
     1:1:void <clinit>():120:120 -> <clinit>
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.h5$b:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.g5$b:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Swap -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> k
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> i
@@ -4357,13 +4351,13 @@
     1:2:void <init>(java.lang.String,int,int):45:46 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):32:32 -> a
     2:2:com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] values():32:32 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.s5:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.r5:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):36:38 -> <init>
-    1:1:int getLocalIndex():102:102 -> A
-    1:13:int getStoreType():53:65 -> B
-    1:1:com.android.tools.r8.ir.code.ValueType getType():98:98 -> C
+    1:1:int getLocalIndex():102:102 -> B
+    1:13:int getStoreType():53:65 -> C
+    1:1:com.android.tools.r8.ir.code.ValueType getType():98:98 -> D
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
     2:2: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):89:89 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):94:94 -> a
@@ -4383,10 +4377,10 @@
     com.android.tools.r8.cf.code.CfStore asStore() -> l
     boolean emitsIR() -> o
     1:1:int getCompareToId():43:43 -> p
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.s5$a:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.r5$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():53:53 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.t5:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.s5:
     com.android.tools.r8.cf.code.CfLabel defaultTarget -> b
     int[] keys -> c
     java.util.List targets -> d
@@ -4394,12 +4388,12 @@
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:7:void <init>(com.android.tools.r8.cf.code.CfSwitch$Kind,com.android.tools.r8.cf.code.CfLabel,int[],java.util.List):38:44 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():70:70 -> A
-    1:1:java.util.List getKeys():74:74 -> B
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> B
-    2:2:java.util.List getKeys():74 -> B
-    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():66:66 -> C
-    1:1:java.util.List getSwitchTargets():78:78 -> D
+    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():70:70 -> B
+    1:1:java.util.List getKeys():74:74 -> C
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> C
+    2:2:java.util.List getKeys():74 -> C
+    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():66:66 -> D
+    1:1:java.util.List getSwitchTargets():78:78 -> E
     1:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55:56 -> a
     3:3:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):60:60 -> a
     4:4:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
@@ -4415,18 +4409,18 @@
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):140 -> a
     31:36:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):152:157 -> a
     1:1:int getCompareToId():49:49 -> p
-    boolean isJump() -> x
-com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.t5$a:
+    boolean isJump() -> y
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.s5$a:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfSwitch$Kind -> a
     1:1:void <clinit>():110:110 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.t5$b:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.s5$b:
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> b
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> a
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
     1:1:com.android.tools.r8.cf.code.CfSwitch$Kind[] values():31:31 -> a
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.u5:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.t5:
     1:1:void <init>():26:26 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):41:41 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):64:64 -> a
@@ -4438,8 +4432,8 @@
     8:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):98:100 -> a
     boolean canThrow() -> n
     int getCompareToId() -> p
-    boolean isJump() -> x
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.v5:
+    boolean isJump() -> y
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.u5:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -4462,7 +4456,7 @@
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$acceptCompareTo$1(com.android.tools.r8.cf.code.CfTryCatch):57:57 -> b
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.cf.code.CfTryCatch):58:58 -> c
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.cf.code.CfTryCatch):59:59 -> d
-com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.w5:
+com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.v5:
     com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType) -> a
 com.android.tools.r8.code.AddDouble -> com.android.tools.r8.code.b:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
@@ -4780,7 +4774,7 @@
 com.android.tools.r8.code.BaseInstructionFactory -> com.android.tools.r8.code.K:
     1:1:void <init>():8:8 -> <init>
 com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.B3:
-com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.V4:
+com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.U4:
     com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
 com.android.tools.r8.code.CheckCast -> com.android.tools.r8.code.L:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):25:25 -> <init>
@@ -5000,11 +4994,11 @@
     1:1:com.android.tools.r8.graph.DexString getString():34:34 -> H
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):39:39 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48:48 -> a
-    3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):83:83 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):93:93 -> a
-    6:6:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):270:270 -> a
+    6:6:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):274:274 -> 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):93 -> 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):97:97 -> a
     8:8:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):95:95 -> a
@@ -5037,7 +5031,7 @@
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):66:66 -> a
     7:7:void com.android.tools.r8.code.Format31c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76:76 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     8:8:void com.android.tools.r8.code.Format31c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):56:56 -> b
@@ -5756,7 +5750,7 @@
     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):51 -> a
     7:7:int internalAcceptCompareTo(com.android.tools.r8.code.Instruction,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76:76 -> a
-    9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> a
     1:1:com.android.tools.r8.graph.DexString lambda$specify$1(com.android.tools.r8.code.Format31c):27:27 -> b
     2:4:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):66:66 -> b
@@ -6988,7 +6982,7 @@
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68:68 -> a
-    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1562:1578 -> a
+    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1548:1564 -> a
     3:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
     20:20:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
     20:20:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
@@ -7111,10 +7105,8 @@
     int com.android.tools.r8.code.Format45cc.internalAcceptCompareTo(com.android.tools.r8.code.Instruction,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():176:176 -> a
-    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34 -> a
     3:3:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format45cc.getProto():181:181 -> a
-    3:3:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format45cc.getProto():0 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34:34 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
@@ -7131,19 +7123,16 @@
     25:27:java.lang.String com.android.tools.r8.code.Format45cc.itemToString(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.naming.ClassNameMapper):155:157 -> a
     28:36:void com.android.tools.r8.code.Format45cc.appendRegisterArguments(java.lang.StringBuilder,java.lang.String):163:171 -> a
     37:37:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():176:176 -> a
-    37:37:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0 -> a
     37:37:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):103 -> a
     37:37:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     38:40:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):103:105 -> a
     38:40:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     41:41:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format45cc.getProto():181:181 -> a
-    41:41:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format45cc.getProto():0 -> a
     41:41:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):107 -> a
     41:41:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     42:43:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):107:108 -> a
     42:43:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     44:44:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():176:176 -> a
-    44:44:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0 -> a
     44:44:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):119 -> a
     44:44:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     45:47:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):119:121 -> a
@@ -7157,7 +7146,6 @@
     51:51:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):123 -> a
     51:51:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     52:52:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format45cc.getProto():181:181 -> a
-    52:52:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format45cc.getProto():0 -> a
     52:52:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):125 -> a
     52:52:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     53:54:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):125:126 -> a
@@ -7201,7 +7189,6 @@
     4:6:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):119:121 -> a
     4:6:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     7:7:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():156:156 -> a
-    7:7:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():0 -> a
     7:7:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):123 -> a
     7:7:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     8:9:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):123:124 -> a
@@ -7223,7 +7210,6 @@
     19:19:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):65 -> a
     19:19:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     20:20:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():156:156 -> a
-    20:20:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():0 -> a
     20:20:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67 -> a
     20:20:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     21:22:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67:68 -> a
@@ -7232,7 +7218,6 @@
     24:24:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> a
     24:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56 -> a
     25:25:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():156:156 -> a
-    25:25:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():0 -> a
     25:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56 -> a
     26:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56:56 -> a
     27:33:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):102:108 -> a
@@ -8742,7 +8727,7 @@
     1:1:void <init>():36:36 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.O5:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.N5:
     int $r8$clinit -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
@@ -8768,7 +8753,7 @@
     2:2:boolean apply(java.lang.Object):53 -> apply
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():497:497 -> b
     1:1:java.util.function.Predicate negate():53:53 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.C5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.B5:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> c
     1:1:void <clinit>():1119:1119 -> <clinit>
     1:1:void <init>():1122:1122 -> <init>
@@ -8778,27 +8763,27 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Any.negate():1209 -> negate
     1:1:java.util.function.Predicate negate():1117 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.internal.D5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.internal.C5:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> c
     1:1:void <clinit>():1385:1385 -> <clinit>
     1:1:void <init>():1388:1388 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.internal.E5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.internal.D5:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> e
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.internal.F5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.internal.E5:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> e
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.internal.G5:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.internal.F5:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> c
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.H5:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.G5:
     java.lang.String description -> b
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -8813,7 +8798,7 @@
     1:1:java.util.function.Predicate com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1047:1047 -> negate
     1:1:java.util.function.Predicate com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.internal.I5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.internal.H5:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -8824,9 +8809,9 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Negated.negate():1629:1629 -> negate
     1:1:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.J5:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.I5:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1079:1079 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.K5:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.J5:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> c
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -8836,7 +8821,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$None.negate():1312 -> negate
     1:1:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.internal.L5:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.internal.K5:
     char[] rangeStarts -> c
     char[] rangeEnds -> d
     java.lang.String description -> b
@@ -8848,12 +8833,12 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.negate():497:497 -> negate
     1:1:java.util.function.Predicate negate():1398 -> negate
     1:1:java.lang.String toString():1430:1430 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.internal.M5:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.internal.L5:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> e
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.N5:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.M5:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> d
     int SHIFT -> c
     1:3:void <clinit>():1326:1328 -> <clinit>
@@ -8862,10 +8847,10 @@
 com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.U5:
     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.g8:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.h8:
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence) -> a
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Yb:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -8873,8 +8858,8 @@
     2:2:int hash(java.lang.Object):113:113 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.Wb:
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Xb$a:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Yb$a:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):183:183 -> <init>
@@ -8885,29 +8870,29 @@
     2:2:int com.android.tools.r8.com.google.common.base.Equivalence.hash(java.lang.Object):113:113 -> hashCode
     2:2:int hashCode():229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.xd:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.zj:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.Vj:
     java.util.regex.Pattern pattern -> a
     1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
     1:4:boolean equals(java.lang.Object):60:63 -> equals
     1:1:int hashCode():55:55 -> hashCode
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.yj:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.Uj:
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
     1:1:void <init>(java.util.regex.Matcher):69 -> <init>
     2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.internal.Tr:
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     1:1:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> a
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.Du:
+com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.Xu:
     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.Ju:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.dv:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93:93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.Av:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.Uv:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:2:void <clinit>():35:36 -> <clinit>
@@ -8922,11 +8907,11 @@
     11:11:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
     12:12:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):98:98 -> a
     12:12:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.yv:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.zv:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.Sv:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.Tv:
     1:1:void <init>():95:95 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95:95 -> <init>
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.Hv:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.bw:
     1:1:void checkArgument(boolean):121:121 -> a
     2:2:void checkArgument(boolean,java.lang.Object):135:135 -> a
     3:3:void checkArgument(boolean,java.lang.String,char):170:170 -> a
@@ -8967,9 +8952,9 @@
     4:4:int checkPositionIndex(int,int):1223:1223 -> b
     5:5:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     5:5:int checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.Iv:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.cw:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.Rv:
+com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.lw:
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysFalse():62:62 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate not(com.android.tools.r8.com.google.common.base.Predicate):88:88 -> a
     3:3:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
@@ -8979,27 +8964,27 @@
     6:6:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
     7:7:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysTrue():54:54 -> b
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.Lv:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.fw:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.gw:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):341:342 -> <init>
     1:1:boolean apply(java.lang.Object):347:347 -> apply
     1:3:boolean equals(java.lang.Object):357:359 -> equals
     1:1:int hashCode():352:352 -> hashCode
     1:1:java.lang.String toString():366:366 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.Pv:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.jw:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_TRUE -> a
     1:13:void <clinit>():283:295 -> <clinit>
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281:281 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.Nv:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.hw:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
     1:1:java.lang.String toString():291:291 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.Ov:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.iw:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
     1:1:java.lang.String toString():303:303 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.Qv:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.kw:
     java.util.List components -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):415:415 -> <init>
     2:3:void <init>(java.util.List):418:419 -> <init>
@@ -9010,7 +8995,7 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):457:466 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):43 -> toString
     2:11:java.lang.String toString():450 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.aD:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
@@ -9030,29 +9015,29 @@
     12:12:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     12:12:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     12:12:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.ZC:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.TD:
+com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.uE:
     1:20:java.lang.String repeat(java.lang.String,int):146:165 -> a
     21:21:java.lang.String repeat(java.lang.String,int):155:155 -> a
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.kE:
-com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.nE:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.ME:
+com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.PE:
     1:5:com.android.tools.r8.com.google.common.base.Supplier memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.lE:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.NE:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):114:115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.mE:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.OE:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):150:151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.ME:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.oF:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():482:484 -> <clinit>
@@ -9755,11 +9740,11 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():60 -> hashCode
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.O7:
+com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.P7:
     1:1:void checkEntryNotNull(java.lang.Object,java.lang.Object):34:34 -> a
     2:2:void checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
     3:3:int checkNonnegative(int,java.lang.String):41:41 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.T7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.U7:
     1:4:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):201:204 -> a
     5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     5:5:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):207 -> a
@@ -9771,7 +9756,7 @@
     9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     9:9:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):104 -> a
     10:10:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):105:105 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.P7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Q7:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):105:105 -> <init>
@@ -9787,7 +9772,7 @@
     3:3:java.util.Spliterator trySplit():121 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):105:105 -> trySplit
     4:4:java.util.Spliterator trySplit():121 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.Q7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.R7:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -9801,7 +9786,7 @@
     1:6:void forEachRemaining(java.util.function.Consumer):242:247 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):226:234 -> tryAdvance
     1:16:java.util.Spliterator trySplit():252:267 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.R7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.S7:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -9817,7 +9802,7 @@
     3:3:java.util.Spliterator trySplit():167 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> trySplit
     4:4:java.util.Spliterator trySplit():167 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.S7:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.T7:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -9828,14 +9813,14 @@
     1:4:java.util.Comparator getComparator():87:90 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):60:60 -> tryAdvance
     1:2:java.util.Spliterator trySplit():71:72 -> trySplit
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.h8:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.i8:
     java.util.Comparator comparator -> a
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):37:37 -> compare
     1:3:boolean equals(java.lang.Object):45:47 -> equals
     1:1:int hashCode():54:54 -> hashCode
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.W8:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.X8:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -9846,11 +9831,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.db:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.eb:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> g
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():31:31 -> <init>
-com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.hd:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.id:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> a
     1:2:void <init>():117:118 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):190:190 -> a
@@ -9868,18 +9853,18 @@
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):293:302 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):253 -> toString
     3:12:java.lang.String toString():336 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.fd:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.gd:
     java.lang.Iterable[] val$inputs -> b
     1:1:void <init>(java.lang.Iterable[]):261:261 -> <init>
     1:1:java.util.Iterator iterator():264:264 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     2:2:java.util.Iterator iterator():264 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.fd:
     com.android.tools.r8.com.google.common.collect.FluentIterable$2 this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$2,int):266:266 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.FluentIterable$2$1.get(int):269:269 -> a
     1:1:java.lang.Object get(int):266 -> a
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.hd:
     java.lang.Iterable val$inputs -> b
     1:1:void <init>(java.lang.Iterable):294:294 -> <init>
     1:1:java.util.Iterator iterator():297:297 -> iterator
@@ -9889,7 +9874,7 @@
     3:3:java.util.Iterator iterator():297 -> iterator
     4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     4:4:java.util.Iterator iterator():297 -> iterator
-com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.od:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.pd:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingObject.<init>():55:55 -> <init>
     1:1:void <init>():55 -> <init>
     java.lang.Object com.android.tools.r8.com.google.common.collect.ForwardingObject.delegate() -> a
@@ -9909,7 +9894,7 @@
     2:2:java.lang.Object[] toArray(java.lang.Object[]):128:128 -> toArray
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():72:72 -> toString
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():0 -> toString
-com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.pd:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.qd:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingSet.<init>():55:55 -> <init>
     1:1:void <init>():62 -> <init>
     java.util.Set com.android.tools.r8.com.google.common.collect.ForwardingSet.delegate() -> c
@@ -9924,7 +9909,7 @@
     1:1:java.lang.Object last():84:84 -> last
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):89:89 -> subSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):94:94 -> tailSet
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Zd:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.ue:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableVToK -> b
@@ -10005,19 +9990,19 @@
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.values():469:469 -> values
     1:1:java.util.Collection values():57 -> values
     2:2:java.util.Set values():469:469 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Vd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.qe:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):474:474 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):477:477 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):474 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.Vd$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.qe$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> b
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):483:484 -> <init>
     1:1:java.lang.Object getKey():489:489 -> getKey
     1:1:java.lang.Object getValue():494:494 -> getValue
     1:17:java.lang.Object setValue(java.lang.Object):499:515 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.re:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInVToKBucket -> f
     int valueHash -> d
@@ -10025,7 +10010,7 @@
     int keyHash -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> h
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):99:101 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.Zd$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.ue$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):550:550 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):550:550 -> <init>
@@ -10069,27 +10054,27 @@
     3:3:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():553:553 -> values
     3:3:java.util.Set values():640 -> values
     4:4:java.util.Set values():640:640 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.se:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):645:645 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):648:648 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):645 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.Xd$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.se$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):654:655 -> <init>
     1:1:java.lang.Object getKey():660:660 -> getKey
     1:1:java.lang.Object getValue():665:665 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):670:681 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.Zd$a$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.ue$a$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):612:613 -> <init>
     1:1:java.util.Iterator iterator():629:629 -> iterator
     1:5:boolean remove(java.lang.Object):618:622 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.te:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):629:629 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):632:632 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.Zd$b:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.ue$b:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> b
@@ -10105,15 +10090,15 @@
     5:5:void remove():423 -> remove
     6:8:void remove():424:426 -> remove
     9:9:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Zd$c:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.ue$c:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):439:440 -> <init>
     1:1:java.util.Iterator iterator():445:445 -> iterator
     1:7:boolean remove(java.lang.Object):455:461 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.ae:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.ve:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):445:445 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):448:448 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.he:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.Ce:
     1:1:void <init>():70:70 -> <init>
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> add
     1:1:boolean add(java.lang.Object):33 -> add
@@ -10132,18 +10117,18 @@
     1:1:boolean remove(java.lang.Object):33 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultiset.toString():248:248 -> toString
     1:1:java.lang.String toString():33 -> toString
-com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.le:
+com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.Ge:
     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.Me:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.hf:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean isPartialView():56:56 -> b
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> g
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Ne:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.if:
     1:1:void <init>():341:341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.inverse():41:41 -> e
@@ -10156,7 +10141,7 @@
     1:1:java.util.Collection values():36 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():358:358 -> values
     2:2:java.util.Set values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.Ne$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.if$a:
     1:1:void <init>():159:159 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():153:153 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder.put(java.lang.Object,java.lang.Object):172:172 -> a
@@ -10186,9 +10171,9 @@
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> b
     35:35:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> b
     35:35:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.internal.Oe:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.internal.jf:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Re:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.mf:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -10220,7 +10205,7 @@
     10:15:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> toArray
     10:15:java.lang.Object[] toArray(java.lang.Object[]):200 -> toArray
     16:19:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.Pe:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.kf:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -10233,19 +10218,19 @@
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):480 -> b
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):481:482 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.lf:
     1:1:void <init>():370:370 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object) -> a
     1:1:int expandedCapacity(int,int):361:361 -> a
     2:2:int expandedCapacity(int,int):356:356 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Te:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.of:
     java.lang.Object value -> b
     java.lang.Object key -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):31:33 -> <init>
     1:1:java.lang.Object getKey():39:39 -> getKey
     1:1:java.lang.Object getValue():45:45 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):50:50 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Ue:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.pf:
     java.util.EnumMap delegate -> e
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.<init>():445:445 -> <init>
     1:1:void <init>(java.util.EnumMap):51 -> <init>
@@ -10280,7 +10265,7 @@
     1:1:int size():68:68 -> size
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():445:445 -> values
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():0 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.qf:
     java.util.EnumSet delegate -> d
     int hashCode -> e
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -10301,7 +10286,7 @@
     1:1:int size():84:84 -> size
     1:1:java.util.Spliterator spliterator():74:74 -> spliterator
     1:1:java.lang.String toString():132:132 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.af:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.vf:
     int $r8$clinit -> b
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -10429,11 +10414,11 @@
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40 -> spliterator
     2:2:java.util.Spliterator spliterator():576 -> spliterator
     1:1:java.util.List subList(int,int):57:57 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Ze:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.uf:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):393:393 -> <init>
     1:1:java.lang.Object get(int):396:396 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.af$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.vf$a:
     1:1:void <init>():739:739 -> <init>
     2:2:void <init>(int):744:744 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.add(java.lang.Object):757:757 -> a
@@ -10442,7 +10427,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder addAll(java.lang.Iterable):772:772 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object[]):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):757:757 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.bf:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.wf:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean isPartialView():657:657 -> b
@@ -10475,7 +10460,7 @@
     2:2:java.util.ListIterator listIterator(int):601 -> listIterator
     1:1:int size():652:652 -> size
     1:1:java.util.List subList(int,int):601:601 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.af$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.vf$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> e
     int length -> d
     int offset -> c
@@ -10492,14 +10477,14 @@
     2:2:java.util.ListIterator listIterator(int):457 -> listIterator
     1:1:int size():468:468 -> size
     1:1:java.util.List subList(int,int):457:457 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.df:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.yf:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):405:406 -> get
     1:2:java.util.Collection get(java.lang.Object):52 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):406 -> get
     3:3:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.cf:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.xf:
     1:1:void <init>():237:237 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.put(java.lang.Object,java.lang.Object):168:169 -> a
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):242 -> a
@@ -10535,7 +10520,7 @@
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328 -> a
     28:28:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328:328 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.ff:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.Af:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> c
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet keySet -> b
@@ -10619,12 +10604,12 @@
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3815:3824 -> toString
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.ef:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.zf:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):707:707 -> <init>
     1:1:boolean hasNext():710:710 -> hasNext
     1:1:java.lang.Object next():715:715 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.ff$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.Af$a:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -10648,28 +10633,28 @@
     46:46:com.android.tools.r8.com.google.common.collect.ImmutableMap build():371 -> a
     47:47:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():113:113 -> a
     47:47:com.android.tools.r8.com.google.common.collect.ImmutableMap build():369 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.gf:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.Bf:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):463:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> h
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl.iterator():471:471 -> iterator
     1:1:java.util.Iterator iterator():462 -> iterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.jf:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.Ef:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> c
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.Cf:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):104:105 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():111:111 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.if:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.Df:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> c
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):79:80 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():86:86 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.lf:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.Gf:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean isPartialView():98:98 -> b
     1:4:boolean contains(java.lang.Object):88:91 -> contains
@@ -10679,7 +10664,7 @@
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> h
     1:1:int hashCode():109:109 -> hashCode
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.kf:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.Ff:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     java.util.Map$Entry[] entries -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -10694,7 +10679,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet.iterator():55:55 -> iterator
     1:1:java.util.Iterator iterator():39 -> iterator
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.mf:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.Hf:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -10709,7 +10694,7 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.pf:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.Kf:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):40:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):37:37 -> a
@@ -10727,18 +10712,18 @@
     1:1:java.util.Iterator iterator():36 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.nf:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.If:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):51:52 -> <init>
     1:1:boolean hasNext():56:56 -> hasNext
     1:1:java.lang.Object next():61:61 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.of:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.Jf:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> g
     1:1:java.lang.Object get(int):86:86 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.tf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.Of:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     int size -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
@@ -10777,13 +10762,13 @@
     1:1:int size():493:493 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():67 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.Lf:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):595:595 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.rf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.Mf:
     com.android.tools.r8.com.google.common.collect.Multimap builderMultimap -> a
     1:1:void <init>():156:156 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):159:160 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.sf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.Nf:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):539:540 -> <init>
     1:1:boolean isPartialView():550:550 -> b
@@ -10796,7 +10781,7 @@
     1:1:int size():555:555 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():555 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.internal.tf$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.internal.Of$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -10808,7 +10793,7 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):598 -> next
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):595 -> next
     7:7:java.lang.Object next():589 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.tf$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.Of$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     boolean isPartialView() -> b
@@ -10830,7 +10815,7 @@
     1:1:int size():661:661 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():661 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Rf:
     int $r8$clinit -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> c
@@ -10861,14 +10846,14 @@
     com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> g
     1:1:int hashCode():345:345 -> hashCode
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.Pf:
     java.util.Iterator val$entryIterator -> c
     java.lang.Object element -> b
     int remaining -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):240:240 -> <init>
     1:1:boolean hasNext():246:246 -> hasNext
     1:7:java.lang.Object next():251:257 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.vf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.Qf:
     com.android.tools.r8.com.google.common.collect.Multiset contents -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):499:500 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder.add(java.lang.Object):513:513 -> a
@@ -10895,7 +10880,7 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):513 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):513:513 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.wf$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Rf$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373:373 -> <init>
@@ -10905,9 +10890,9 @@
     1:1:java.lang.Object get(int):372 -> get
     1:1:int hashCode():404:404 -> hashCode
     1:1:int size():386:386 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.internal.xf:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.internal.Sf:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.yf:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.Tf:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     int $r8$clinit -> c
     1:1:void <init>():332:332 -> <init>
@@ -10939,7 +10924,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> g
     2:10:int chooseTableSize(int):229:237 -> g
     1:1:int hashCode():354:354 -> hashCode
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.yf$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Tf$a:
     1:1:void <init>():471:471 -> <init>
     2:2:void <init>(int):475:475 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.add(java.lang.Object):490:490 -> a
@@ -10948,7 +10933,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object[]):506:506 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):490:490 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.Af:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.Vf:
     1:1:void <init>():376:376 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():381:381 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():400:400 -> e
@@ -10959,13 +10944,13 @@
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction,java.util.Comparator):94:94 -> spliterator
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40 -> spliterator
     2:2:java.util.Spliterator spliterator():386 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.Uf:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1.delegateCollection():408:408 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> g
     1:1:java.lang.Object get(int):403:403 -> get
-com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.Cj:
     1:2:boolean contains(java.lang.Iterable,java.lang.Object):138:139 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     3:3:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):107 -> a
@@ -11022,12 +11007,12 @@
     1:3:int size(java.lang.Iterable):126:128 -> d
     4:8:int com.android.tools.r8.com.google.common.collect.Iterators.size(java.util.Iterator):168:172 -> d
     4:8:int size(java.lang.Iterable):128 -> d
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.bj:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.xj:
     1:1:void <init>():1061:1061 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):1061:1061 -> apply
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$10.apply(java.lang.Iterable):1064:1064 -> apply
     2:2:java.lang.Object apply(java.lang.Object):1061 -> apply
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.cj:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.yj:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> c
     java.lang.Iterable val$unfiltered -> b
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> <init>
@@ -11053,7 +11038,7 @@
     3:3:java.util.Spliterator spliterator():594 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> spliterator
     4:4:java.util.Spliterator spliterator():594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.dj:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.zj:
     java.lang.Iterable val$fromIterable -> b
     com.android.tools.r8.com.google.common.base.Function val$function -> c
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):722:722 -> <init>
@@ -11063,7 +11048,7 @@
     2:2:void forEach(java.util.function.Consumer):731:731 -> forEach
     1:1:java.util.Iterator iterator():725:725 -> iterator
     1:1:java.util.Spliterator spliterator():736:736 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.fj:
+com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.Bj:
     java.lang.Iterable val$iterable -> b
     int val$numberToSkip -> c
     1:1:void <init>(java.lang.Iterable,int):889:889 -> <init>
@@ -11075,7 +11060,7 @@
     10:14:java.util.Iterator iterator():899 -> iterator
     15:15:java.util.Iterator iterator():906:906 -> iterator
     1:6:java.util.Spliterator spliterator():931:936 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.ej:
+com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.Aj:
     java.util.Iterator val$iterator -> b
     boolean atStart -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Iterables$6,java.util.Iterator):906:907 -> <init>
@@ -11085,7 +11070,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():923 -> remove
     3:3:void remove():924:924 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.uj:
+com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.Qj:
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator emptyIterator():78 -> a
     2:9:boolean contains(java.util.Iterator,java.lang.Object):180:187 -> a
@@ -11123,35 +11108,35 @@
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator unmodifiableIterator(java.util.Iterator):131 -> b
     2:7:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator unmodifiableIterator(java.util.Iterator):132:137 -> b
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.kj:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Gj:
     java.util.Iterator val$iterator -> a
     1:1:void <init>(java.util.Iterator):137:137 -> <init>
     1:1:boolean hasNext():140:140 -> hasNext
     1:1:java.lang.Object next():145:145 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.lj:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Hj:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     1:2:void <init>(java.lang.Iterable):411:412 -> <init>
     1:1:boolean hasNext():425:425 -> hasNext
     1:7:java.lang.Object next():430:436 -> next
     1:1:void remove():441:441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.mj:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Ij:
     java.lang.Object[] val$elements -> b
     int index -> a
     1:2:void <init>(java.lang.Object[]):471:472 -> <init>
     1:1:boolean hasNext():476:476 -> hasNext
     1:6:java.lang.Object next():481:486 -> next
     7:7:java.lang.Object next():482:482 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.nj:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Jj:
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
     1:7:java.lang.Object computeNext():662:668 -> k
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.oj:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Kj:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):820:820 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.pj:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Lj:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -11160,21 +11145,21 @@
     1:5:java.lang.Object next():962:966 -> next
     6:6:java.lang.Object next():963:963 -> next
     1:1:void remove():971:971 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.qj:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Mj:
     java.lang.Object val$value -> b
     boolean done -> a
     1:1:void <init>(java.lang.Object):1104:1104 -> <init>
     1:1:boolean hasNext():1109:1109 -> hasNext
     1:5:java.lang.Object next():1114:1118 -> next
     6:6:java.lang.Object next():1115:1115 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.rj:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.Nj:
     java.lang.Object[] array -> c
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> e
     int offset -> d
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.sj:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.Oj:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -11194,14 +11179,14 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():1433 -> remove
     3:4:void remove():1434:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.tj:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.Pj:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     1:1:void remove():112 -> remove
-com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.To:
+com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.qp:
     1:1:void <init>():80:80 -> <init>
     2:2:void <init>(int):84:84 -> <init>
     1:2:int com.android.tools.r8.com.google.common.collect.Multisets.inferDistinctElements(java.lang.Iterable):402:403 -> a
@@ -11226,8 +11211,8 @@
     1:1:boolean remove(java.lang.Object):42 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultiset.toString():248:248 -> toString
     1:1:java.lang.String toString():42 -> toString
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.Zo:
-com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.ep:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.Bp:
     1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> a
     1:1:java.util.ArrayList newArrayList(java.util.Iterator):164 -> a
     2:2:java.util.ArrayList newArrayList(java.util.Iterator):165:165 -> a
@@ -11247,9 +11232,9 @@
     24:41:boolean equalsImpl(java.util.List,java.lang.Object):1017:1034 -> a
     42:52:boolean com.android.tools.r8.com.google.common.collect.Iterators.elementsEqual(java.util.Iterator,java.util.Iterator):274:284 -> a
     42:52:boolean equalsImpl(java.util.List,java.lang.Object):1034 -> a
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.bp:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.yp:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.dp:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.Ap:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:java.util.List getForwardList():859:859 -> a
@@ -11310,7 +11295,7 @@
     7:7:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):870:870 -> subList
     7:7:java.util.List subList(int,int):912 -> subList
     8:8:java.util.List subList(int,int):912:912 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.cp:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.zp:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -11333,7 +11318,7 @@
     2:2:void remove():975 -> remove
     3:4:void remove():976:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.kq:
+com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.Iq:
     1:1:java.util.HashMap newHashMap():283:283 -> a
     2:2:int capacity(int):309:309 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -11342,13 +11327,13 @@
     1:1:java.util.HashMap newHashMapWithExpectedSize(int):300:300 -> b
     2:2:java.util.IdentityHashMap newIdentityHashMap():511:511 -> b
     1:1:java.util.LinkedHashMap newLinkedHashMapWithExpectedSize(int):377:377 -> c
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.Yp:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.Zp:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.xq:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(java.util.Map$Entry):1447:1447 -> <init>
     1:1:java.lang.Object getKey():1450:1450 -> getKey
     1:1:java.lang.Object getValue():1455:1455 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.aq:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.yq:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -11361,23 +11346,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1447:1447 -> next
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps$6.next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.dq:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.Bq:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> a
     1:8:void <clinit>():93:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):92:92 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.bq:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.zq:
     1:1:void <init>(java.lang.String,int):93:93 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):93:93 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1.apply(java.util.Map$Entry):97:97 -> apply
     2:2:java.lang.Object apply(java.lang.Object):93 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.cq:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.Aq:
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):100:100 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2.apply(java.util.Map$Entry):104:104 -> apply
     2:2:java.lang.Object apply(java.lang.Object):100 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.eq:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.Cq:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -11396,11 +11381,11 @@
     6:6:boolean retainAll(java.util.Collection):4166 -> retainAll
     7:13:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.gq:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.Eq:
     1:1:void <init>():3653:3653 -> <init>
     java.util.Iterator entryIterator() -> b
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.fq:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.Dq:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3666:3666 -> <init>
     1:1:java.util.Map map():3669:3669 -> a
@@ -11413,7 +11398,7 @@
     2:2:java.util.Spliterator spliterator():3679 -> spliterator
     3:3:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.entrySpliterator():3660:3660 -> spliterator
     3:3:java.util.Spliterator spliterator():3679 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.hq:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.Fq:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):3839:3840 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3856:3856 -> a
@@ -11448,7 +11433,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> size
     1:1:int size():3861 -> size
     2:2:int size():3861:3861 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.iq:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.Gq:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):4026:4027 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):4043:4043 -> a
@@ -11504,7 +11489,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$Values.map():4031:4031 -> size
     1:1:int size():4093 -> size
     2:2:int size():4093:4093 -> size
-com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.jq:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.Hq:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -11516,31 +11501,31 @@
     2:2:java.util.Collection com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap.createValues():3649:3649 -> values
     2:2:java.util.Collection values():3645 -> values
     3:3:java.util.Collection values():3645:3645 -> values
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.Jr:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.cs:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
     java.util.Collection entries() -> a
     java.util.Map asMap() -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.ds:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.Lr:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.es:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier.get():199:199 -> get
     1:1:java.lang.Object get():190 -> get
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.Mr:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.fs:
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>():77:77 -> <init>
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$1):71 -> <init>
     1:1:void <init>():438 -> <init>
     com.android.tools.r8.com.google.common.collect.ListMultimap build() -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys(int):126:127 -> b
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys():113 -> b
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.Or:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.hs:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys.arrayListValues(int):300:301 -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues():290 -> a
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.Nr:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.gs:
     com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys this$0 -> b
     int val$expectedValuesPerKey -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys,int):301:301 -> <init>
@@ -11553,12 +11538,12 @@
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap build():305:305 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.newListMultimap(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):294:294 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap build():304 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.Pr:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.is:
     com.android.tools.r8.com.google.common.base.Supplier factory -> g
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap.createCollection():307:307 -> j
     1:1:java.util.Collection createCollection():297 -> j
-com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.internal.Qr:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.internal.js:
     1:1:void <init>():1793:1793 -> <init>
     1:1:void clear():1821:1821 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> clear
@@ -11576,7 +11561,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> size
     2:2:int size():1798 -> size
     3:3:int size():1798:1798 -> size
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.Tr:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.ms:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1678:1678 -> a
@@ -11598,17 +11583,17 @@
     3:3:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Set elementSet():1786:1786 -> l
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.Sr:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.ls:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1652:1652 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1652:1652 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1.transform(java.util.Map$Entry):1655:1655 -> a
     2:2:java.lang.Object transform(java.lang.Object):1652 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.Rr:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.ks:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
     1:1:int getCount():1663:1663 -> a
     1:1:java.lang.Object getElement():1658:1658 -> b
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.Tr$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.ms$a:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> a
@@ -11621,7 +11606,7 @@
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.Ur:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.ns:
     int remove(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:1:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):321:321 -> a
@@ -11637,10 +11622,10 @@
     2:3:void forEach(java.util.function.Consumer):491:492 -> forEach
     java.util.Set elementSet() -> l
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.Ur$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.ns$a:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.bs:
+com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.us:
     1:13:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
     14:14:java.util.Spliterator lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
     15:17:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
@@ -11653,19 +11638,19 @@
     20:20:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
     1:8:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
     9:9:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.Vr:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.os:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
     1:2:int hashCode():854:855 -> hashCode
     1:3:java.lang.String toString():867:869 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.Wr:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.ps:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> a
     1:1:void <clinit>():1165:1165 -> <clinit>
     1:1:void <init>():1164:1164 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1164:1164 -> compare
     2:2:int com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount.compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1168:1168 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1164 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.internal.Yr:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.internal.rs:
     1:1:void <init>():977:977 -> <init>
     1:1:void clear():982:982 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> clear
@@ -11695,25 +11680,25 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> size
     2:2:int size():1017 -> size
     3:3:int size():1017:1017 -> size
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.qs:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ElementSet,java.util.Iterator):1002:1002 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1002:1002 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1.transform(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1005:1005 -> a
     2:2:java.lang.Object transform(java.lang.Object):1002 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.Zr:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.ss:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.as:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.ts:
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
     1:1:int getCount():272:272 -> a
     1:1:java.lang.Object getElement():267:267 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.ms:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.Fs:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -11727,16 +11712,16 @@
     4:4:int com.android.tools.r8.com.google.common.collect.NaturalOrdering.compare(java.lang.Comparable,java.lang.Comparable):37:37 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.gu:
+com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.Au:
     1:1:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):219:219 -> a
     2:2:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
     2:2:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):219 -> a
     3:3:java.lang.Object checkElementNotNull(java.lang.Object,int):235:235 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.jv:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():161:161 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.vA:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -11747,7 +11732,7 @@
     1:1:java.lang.Object get(int):73:73 -> get
     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.Xz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.yA:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> j
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] valueTable -> f
@@ -11802,8 +11787,8 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():189 -> s
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():191:192 -> s
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Vz:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Xz$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.wA:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.yA$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):195:195 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):195:195 -> <init>
@@ -11827,7 +11812,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Xz$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.yA$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> c
@@ -11838,7 +11823,7 @@
     1:1:int hashCode():253:253 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet.iterator():258:258 -> iterator
     1:1:java.util.Iterator iterator():239 -> iterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.Wz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.xA:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> g
@@ -11847,7 +11832,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> get
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):272 -> get
     3:3:java.lang.Object get(int):268 -> get
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Yz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.zA:
     java.lang.Object[] array -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> d
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11860,7 +11845,7 @@
     1:1:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.bA:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.CA:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> f
     java.util.Map$Entry[] entries -> e
@@ -11899,7 +11884,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
     boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.Zz:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.AA:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11908,13 +11893,13 @@
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.aA:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.BA:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.dA:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.EA:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> j
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] entries -> e
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> f
@@ -11936,8 +11921,8 @@
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset.elementSet():140:141 -> l
     1:2:java.util.Set elementSet():34 -> l
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.cA:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.dA$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.DA:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.EA$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11947,11 +11932,11 @@
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.FA:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.fA:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.GA:
     java.lang.Object[] elements -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> h
     java.lang.Object[] table -> e
@@ -11975,7 +11960,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.KB:
+com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.kC:
     1:1:java.util.HashSet newHashSet(java.lang.Object[]):235:235 -> a
     2:2:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSetWithExpectedSize(int):253:253 -> a
     2:2:java.util.HashSet newHashSet(java.lang.Object[]):235 -> a
@@ -12007,7 +11992,7 @@
     2:2:java.util.Set newIdentityHashSet():466:466 -> c
     3:6:com.android.tools.r8.com.google.common.collect.Sets$SetView union(java.util.Set,java.util.Set):741:744 -> c
     1:1:java.util.LinkedHashSet newLinkedHashSet():347:347 -> d
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.AB:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.aC:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -12019,13 +12004,13 @@
     1:1:java.util.stream.Stream parallelStream():790:790 -> parallelStream
     1:3:int size():747:749 -> size
     1:1:java.util.stream.Stream stream():785:785 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.internal.zB:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.internal.ZB:
     java.util.Iterator itr2 -> d
     java.util.Iterator itr1 -> c
     com.android.tools.r8.com.google.common.collect.Sets$1 this$0 -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):763:765 -> <init>
     1:10:java.lang.Object computeNext():769:778 -> k
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.cC:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -12037,12 +12022,12 @@
     1:1:java.util.stream.Stream parallelStream():868:868 -> parallelStream
     1:2:int size():874:875 -> size
     1:1:java.util.stream.Stream stream():863:863 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.BB:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.bC:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
     1:7:java.lang.Object computeNext():850:856 -> k
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.EB:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.eC:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):914:914 -> <init>
@@ -12055,12 +12040,12 @@
     1:1:java.util.stream.Stream parallelStream():939:939 -> parallelStream
     1:2:int size():945:946 -> size
     1:1:java.util.stream.Stream stream():934:934 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.DB:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.dC:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
     1:7:java.lang.Object computeNext():921:927 -> k
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.IB:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.iC:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> b
     int val$size -> a
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1676:1676 -> <init>
@@ -12068,31 +12053,31 @@
     1:1:java.util.Iterator iterator():1688:1688 -> iterator
     1:1:int size():1755:1755 -> size
     1:1:java.lang.String toString():1760:1760 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.HB:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.hC:
     java.util.BitSet bits -> c
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1688:1689 -> <init>
     1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1693:1721 -> k
     1:29:java.lang.Object computeNext():1688 -> k
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.GB:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.gC:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> b
     java.util.BitSet val$copy -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1721:1721 -> <init>
     1:2:boolean contains(java.lang.Object):1724:1725 -> contains
     1:1:java.util.Iterator iterator():1730:1730 -> iterator
     1:1:int size():1746:1746 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.FB:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.fC:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> d
     int i -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1730:1731 -> <init>
     1:5:java.lang.Object computeNext():1735:1739 -> k
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.JB:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.jC:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     1:1:boolean retainAll(java.util.Collection):85 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85:85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.KB$a:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.kC$a:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):599:599 -> <init>
     2:2:void <init>():600:600 -> <init>
     1:1:boolean add(java.lang.Object):640:640 -> add
@@ -12102,7 +12087,7 @@
     1:1:boolean removeAll(java.util.Collection):679:679 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):692:692 -> removeIf
     1:1:boolean retainAll(java.util.Collection):705:705 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.LB:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.lC:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -12129,7 +12114,7 @@
     1:1:java.util.stream.Stream stream():1847:1847 -> stream
     1:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.jC:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.JC:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -12154,7 +12139,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90 -> j
     boolean isPartialView() -> m
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> s
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.KC:
     java.lang.Object element -> c
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -12169,7 +12154,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.lC:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.LC:
     java.lang.Object element -> d
     int cachedHashCode -> e
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -12186,7 +12171,7 @@
     1:1:boolean isHashCodeFast():97:97 -> f
     1:3:int hashCode():88:90 -> hashCode
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.zD:
+com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.aE:
     java.util.Spliterator lambda$concat$0(java.util.Spliterator) -> a
     1:3:java.util.stream.Stream stream(java.lang.Iterable):62:64 -> a
     4:4:java.util.stream.Stream stream(java.util.Iterator):82:82 -> a
@@ -12210,27 +12195,27 @@
     80:80:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):237 -> a
     81:92:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):238:249 -> a
     93:93:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):247:247 -> a
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.tD:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.UD:
     java.util.function.BiFunction val$function -> c
     java.util.Iterator val$itrB -> b
     java.util.Iterator val$itrA -> a
     1:1:void <init>(long,int,java.util.Iterator,java.util.Iterator,java.util.function.BiFunction):249:249 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):252:253 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.VD:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):369:370 -> <init>
     1:1:void accept(java.lang.Object):375:375 -> accept
     1:6:boolean tryAdvance(java.util.function.Consumer):380:385 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.WD:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):352:353 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):357:358 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.wD:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.XD:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.xD:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.YD:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -12244,17 +12229,17 @@
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():434:434 -> trySplit
     7:7:java.util.Spliterator trySplit():413 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.WE:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.yF:
     java.util.Iterator backingIterator -> a
     1:2:void <init>(java.util.Iterator):35:36 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():43:43 -> hasNext
     1:1:java.lang.Object next():48:48 -> next
     1:1:void remove():53:53 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.bG:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.BG:
     1:1:void <init>():35:35 -> <init>
     1:1:void remove():46:46 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.cG:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.CG:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):44:44 -> add
     1:1:void set(java.lang.Object):56:56 -> set
@@ -12271,7 +12256,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.de:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.ye:
     char[] hexDigits -> a
     int $r8$clinit -> b
     1:1:void <clinit>():429:429 -> <clinit>
@@ -12284,7 +12269,7 @@
     1:3:boolean equals(java.lang.Object):380:382 -> equals
     1:8:int hashCode():396:403 -> hashCode
     1:6:java.lang.String toString():421:426 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.be:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.we:
     byte[] bytes -> c
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -12292,17 +12277,17 @@
     1:5:int asInt():278:282 -> b
     1:1:int bits():268:268 -> c
     1:1:byte[] getBytesInternal():313:313 -> d
-com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.xe:
     int hash -> c
     1:2:void <init>(int):125:126 -> <init>
     1:1:byte[] asBytes():136:136 -> a
     2:2:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):168:168 -> a
     1:1:int asInt():146:146 -> b
     int bits() -> c
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.Be:
     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.ie:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.De:
     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
@@ -12312,17 +12297,17 @@
     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.ke:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.Fe:
 # {"id":"sourceFile","fileName":"Hashing.java"}
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_128():133:133 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_32():111:111 -> b
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():200:200 -> c
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.je:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Ee:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():204:204 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.Jq:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.hr:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -12337,8 +12322,8 @@
     15:15:java.security.MessageDigest com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction.getMessageDigest(java.lang.String):79:79 -> a
     15:15:com.android.tools.r8.com.google.common.hash.Hasher newHasher():92 -> a
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.Hq:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.Iq:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.gr:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -12369,18 +12354,16 @@
     18:18:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.putBytes(byte[]):79 -> a
     18:18:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.putBytes(byte[]):0 -> a
     19:19:void com.android.tools.r8.com.google.common.hash.AbstractByteHasher.update(byte[]):47:47 -> a
-    19:19:void com.android.tools.r8.com.google.common.hash.AbstractByteHasher.update(byte[]):0 -> a
     19:19:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.putBytes(byte[]):80 -> a
     19:19:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.putBytes(byte[]):0 -> a
     20:21:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.update(byte[],int,int):138:139 -> a
     20:21:void com.android.tools.r8.com.google.common.hash.AbstractByteHasher.update(byte[]):47 -> a
-    20:21:void com.android.tools.r8.com.google.common.hash.AbstractByteHasher.update(byte[]):0 -> a
     20:21:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.putBytes(byte[]):80 -> a
     20:21:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.putBytes(byte[]):0 -> a
     1:3:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.update(int):102:104 -> b
     4:5:void update(byte[],int,int):138:139 -> b
     6:6:void checkNotDone():149:149 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.ws:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_128 -> a
     1:3:void <clinit>():43:45 -> <clinit>
     1:1:void <init>(int):51:51 -> <init>
@@ -12388,7 +12371,7 @@
     1:3:boolean equals(java.lang.Object):72:74 -> equals
     1:1:int hashCode():81:81 -> hashCode
     1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.cs:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.vs:
     long h2 -> e
     int length -> f
     long h1 -> d
@@ -12459,7 +12442,7 @@
     1:20:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytesInternal(java.nio.ByteBuffer):113:132 -> b
     21:27:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():208:214 -> b
     1:3:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():201:203 -> c
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.fs:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.ys:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_32 -> a
     1:3:void <clinit>():53:55 -> <clinit>
     1:1:void <init>(int):65:65 -> <init>
@@ -12491,7 +12474,7 @@
     1:3:boolean equals(java.lang.Object):86:88 -> equals
     1:1:int hashCode():95:95 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.es:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.xs:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -12593,7 +12576,7 @@
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.P5:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.O5:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -12611,15 +12594,16 @@
     1:1:boolean ready():106:106 -> ready
     1:2:void reset():124:125 -> reset
     1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.S5:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.R5:
     1:1:void <init>():76:76 -> <init>
-    java.io.Reader openStream() -> a
-    1:1:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.Q5:
+    1:2:java.io.BufferedReader openBufferedStream():113:114 -> a
+    3:3:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
+    java.io.Reader openStream() -> b
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.P5:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():525:525 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
-    1:1:java.io.Reader openStream():535:535 -> a
+    1:1:java.io.Reader openStream():535:535 -> b
     1:1:java.lang.String toString():609:609 -> toString
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toString
     2:2:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):546 -> toString
@@ -12627,13 +12611,13 @@
     3:21:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):553:571 -> toString
     3:21:java.lang.String toString():609 -> toString
     22:22:java.lang.String toString():609:609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.R5:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.Q5:
     1:1:void <init>(java.lang.String):630:630 -> <init>
-    1:1:java.io.Reader openStream():635:635 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.C7:
+    1:1:java.io.Reader openStream():635:635 -> b
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.D7:
     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.G7:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.H7:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
     java.util.Deque stack -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> c
@@ -12666,12 +12650,12 @@
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     24:24:void close():227 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.D7:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.E7:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.E7:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.F7:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -12682,9 +12666,9 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.F7:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.G7:
     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.Qh:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.li:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -12704,14 +12688,14 @@
     108:108:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkRoundingUnnecessary(boolean):81:81 -> a
     108:108:int divide(int,int,java.math.RoundingMode):340 -> a
     109:109:int divide(int,int,java.math.RoundingMode):320:320 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Ph:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.ki:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():121:121 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.qq:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.Oq:
     1:1:int checkNonNegative(java.lang.String,int):53:53 -> a
-com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.Di:
+com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.Yi:
     int saturatedCast(long) -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.Bj:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.Xj:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.String):85:85 -> a
@@ -12725,7 +12709,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.Cj:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.Yj:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -12741,15 +12725,15 @@
     4:4:void com.android.tools.r8.com.google.gson.internal.Streams.write(com.android.tools.r8.com.google.gson.JsonElement,com.android.tools.r8.com.google.gson.stream.JsonWriter):72:72 -> toString
     4:4:java.lang.String toString():324 -> toString
     5:7:java.lang.String toString():325:327 -> toString
-com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.Dj:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.Zj:
     1:1:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.Ej:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.ak:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:boolean equals(java.lang.Object):61:61 -> equals
     1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.Fj:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.bk:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> a
     1:2:void <init>():32:33 -> <init>
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
@@ -12764,16 +12748,15 @@
     9:9:void addProperty(java.lang.String,java.lang.Boolean):101 -> a
     10:10:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     11:11:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):161:161 -> a
-    1:1:com.android.tools.r8.com.google.gson.JsonArray getAsJsonArray(java.lang.String):181:181 -> b
-    1:1:boolean has(java.lang.String):151:151 -> c
+    1:1:boolean has(java.lang.String):151:151 -> b
     1:1:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.Gj:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.ck:
     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.Hj:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.dk:
     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
@@ -12790,7 +12773,7 @@
     18:27:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     28:28:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     29:33:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):86:90 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.Ij:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.ek:
     java.lang.Class[] PRIMITIVE_TYPES -> b
     java.lang.Object value -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12829,14 +12812,14 @@
     1:1:boolean isBoolean():112:112 -> h
     1:13:int hashCode():289:301 -> hashCode
     1:1:boolean isNumber():146:146 -> i
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.Kj:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.gk:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.nF:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.OF:
     1:1:void <init>():119:119 -> <init>
     java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.oo:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.Lo:
     java.lang.String value -> a
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -12846,7 +12829,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.Wo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.tp:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> e
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet keySet -> g
     java.util.Comparator NATURAL_ORDER -> h
@@ -12889,12 +12872,12 @@
     1:3:java.lang.Object remove(java.lang.Object):111 -> remove
     4:4:java.lang.Object remove(java.lang.Object):112:112 -> remove
     1:1:int size():78:78 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.Uo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.rp:
     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.Wo$a:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.tp$a:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -12902,11 +12885,11 @@
     1:1:java.util.Iterator iterator():566:566 -> iterator
     1:9:boolean remove(java.lang.Object):578:586 -> remove
     1:1:int size():562:562 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.Vo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.sp:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568:568 -> next
     1:1:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.Wo$b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.tp$b:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -12918,10 +12901,10 @@
     2:4:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):277:279 -> remove
     2:4:boolean remove(java.lang.Object):613 -> remove
     1:1:int size():597:597 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.Xo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.up:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:1:java.lang.Object next():603:603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.Wo$c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.tp$c:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> a
@@ -12934,7 +12917,7 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> k
     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.Yo:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.vp:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> e
@@ -12951,16 +12934,16 @@
     1:2:int hashCode():491:492 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):475:476 -> setValue
     1:1:java.lang.String toString():496:496 -> toString
-com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.yD:
+com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.ZD:
 # {"id":"sourceFile","fileName":"Streams.java"}
     1:19:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):46:64 -> a
     20:20:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):62:62 -> a
     21:21:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):60:60 -> a
     22:25:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):55:58 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.pF:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.QF:
     com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> a
     1:1:void <clinit>():714:714 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.oF:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.PF:
     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
@@ -12986,7 +12969,7 @@
     37:38:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> b
     39:62:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> b
     63:68:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> b
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.Jj:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.fk:
     long peekedLong -> i
     char[] buffer -> c
     int stackSize -> m
@@ -13083,7 +13066,7 @@
     54:54:com.android.tools.r8.com.google.gson.stream.JsonToken peek():430:430 -> o
     1:5:void skipToEndOfLine():1411:1415 -> p
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.internal.Lj:
+com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.internal.hk:
     com.android.tools.r8.com.google.gson.stream.JsonToken END_ARRAY -> b
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_OBJECT -> c
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_ARRAY -> a
@@ -13098,7 +13081,7 @@
     1:54:void <clinit>():31:84 -> <clinit>
     55:55:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.Mj:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.ik:
     java.lang.String deferredName -> f
     int[] stack -> b
     java.lang.String[] REPLACEMENT_CHARS -> h
@@ -13148,7 +13131,7 @@
     10:11:void writeDeferredName():402:403 -> h
     12:12:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():616:616 -> h
     12:12:void writeDeferredName():401 -> h
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.Wp:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.tq:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:21:void run(java.lang.String[]):190:210 -> a
@@ -13192,7 +13175,7 @@
     60:60:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     60:60:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):128 -> a
     61:81:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):128:148 -> a
-com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.v8:
+com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.w8:
     java.util.Map seenSetForTesting -> b
     java.util.function.Consumer testingConsumer -> a
     int nextProcessorId -> c
@@ -13204,13 +13187,13 @@
     2:2:com.android.tools.r8.contexts.CompilationContext createInitialContext(com.android.tools.r8.utils.InternalOptions):34:34 -> a
     3:9:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):46:52 -> a
     10:11:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():65:66 -> a
-com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.t8:
-com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.v8:
     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$MethodProcessingContext -> com.android.tools.r8.internal.v8$a:
+com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.w8$a:
     com.android.tools.r8.graph.ProgramMethod method -> b
     int nextId -> c
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
@@ -13227,7 +13210,7 @@
     2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):160:160 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod getMethodContext():141:141 -> c
     2:4:java.lang.StringBuilder buildSuffix(java.lang.StringBuilder):146:148 -> c
-com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.v8$b:
+com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.w8$b:
     com.android.tools.r8.contexts.CompilationContext parent -> a
     int processorId -> b
     boolean $assertionsDisabled -> c
@@ -13244,7 +13227,7 @@
     6:6:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):103 -> a
     1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):98:98 -> b
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):108 -> b
-com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.v8$c:
+com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.w8$c:
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext parent -> a
     int positionId -> b
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,int,com.android.tools.r8.contexts.CompilationContext$1):164:164 -> <init>
@@ -13313,10 +13296,15 @@
     131:139:void addToMainDexClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo$Builder,java.lang.Iterable):244:252 -> a
     140:140:void addToMainDexClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo$Builder,java.lang.Iterable):249:249 -> a
     141:143:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):295:295 -> a
-    144:147:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):299:302 -> a
-    148:148:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    148:148:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):302 -> a
-    149:149:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):302:302 -> a
+    144:146:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):299:301 -> a
+    147:147:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):109:109 -> a
+    147:147:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):301 -> a
+    148:148:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):108:108 -> a
+    148:148:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):301 -> a
+    149:156:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):300:307 -> a
+    157:157:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    157:157:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):307 -> a
+    158:158:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):307:307 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$400(com.android.tools.r8.dex.ApplicationReader):63:63 -> b
     2:6:com.android.tools.r8.graph.LazyLoadedDexApplication readWithoutDumping(java.util.concurrent.ExecutorService):110:110 -> b
     7:7:com.android.tools.r8.shaking.MainDexInfo readMainDexClassesForR8(com.android.tools.r8.graph.DexApplication):215:215 -> b
@@ -13331,24 +13319,24 @@
     boolean hasReadProgramResourceFromDex -> h
     com.android.tools.r8.dex.ApplicationReader this$0 -> i
     java.util.concurrent.ExecutorService executorService -> a
-    1:1:void <clinit>():307:307 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):326:326 -> <init>
-    2:17:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):313:328 -> <init>
-    1:1:boolean access$000(com.android.tools.r8.dex.ApplicationReader$ClassReader):307:307 -> a
-    2:2:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,java.util.Queue):357:357 -> a
-    3:12:void readClassSources(java.util.List,java.util.Queue):365:374 -> a
-    13:13:void readClassSources(java.util.List,java.util.Queue):373:373 -> a
-    14:14:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):376:376 -> a
+    1:1:void <clinit>():312:312 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):331:331 -> <init>
+    2:17:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):318:333 -> <init>
+    1:1:boolean access$000(com.android.tools.r8.dex.ApplicationReader$ClassReader):312:312 -> a
+    2:2:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,java.util.Queue):362:362 -> a
+    3:12:void readClassSources(java.util.List,java.util.Queue):370:379 -> a
+    13:13:void readClassSources(java.util.List,java.util.Queue):378:378 -> a
+    14:14:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):381:381 -> a
     15:15:void com.android.tools.r8.graph.JarClassFileReader.read(com.android.tools.r8.ProgramResource):90:90 -> a
-    15:15:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):376 -> a
-    16:28:void readSources():385:397 -> a
-    29:46: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):405:422 -> a
-    47:53:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):427:433 -> a
-    54:62:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):432:440 -> a
-    63:66:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):439:442 -> a
-    1:1:boolean access$100(com.android.tools.r8.dex.ApplicationReader$ClassReader):307:307 -> b
-    2:24:void readDexSources(java.util.List,java.util.Queue):333:355 -> b
-    25:25:void readDexSources(java.util.List,java.util.Queue):354:354 -> b
+    15:15:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):381 -> a
+    16:28:void readSources():390:402 -> a
+    29:46: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):410:427 -> a
+    47:53:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):432:438 -> a
+    54:62:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):437:445 -> a
+    63:66:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):444:447 -> a
+    1:1:boolean access$100(com.android.tools.r8.dex.ApplicationReader$ClassReader):312:312 -> b
+    2:24:void readDexSources(java.util.List,java.util.Queue):338:360 -> b
+    25:25:void readDexSources(java.util.List,java.util.Queue):359:359 -> b
 com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.dex.a$b:
     com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.b:
@@ -13368,10 +13356,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):162:162 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):179:190 -> <init>
     1:1:java.util.List distribute(java.util.concurrent.ExecutorService):197:197 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():456:456 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():459:459 -> a
     2:2:java.util.List distribute(java.util.concurrent.ExecutorService):197 -> a
     3:3:java.util.List distribute(java.util.concurrent.ExecutorService):198:198 -> a
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():472:472 -> a
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():475:475 -> a
     4:4:java.util.List distribute(java.util.concurrent.ExecutorService):199 -> a
     5:14:java.util.List distribute(java.util.concurrent.ExecutorService):199:208 -> a
     15:16:void encodeChecksums(java.lang.Iterable):218:219 -> a
@@ -13383,12 +13371,12 @@
     30:30:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):295:295 -> a
     31:40:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):318:327 -> a
     31:40:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
-    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():472:472 -> a
+    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():475:475 -> a
     41:41:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):327 -> a
     41:41:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
     42:48:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):330:336 -> a
     42:48:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
-    49:49:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():468:468 -> a
+    49:49:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():471:471 -> a
     49:49:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):336 -> a
     49:49:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
     50:58:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):340:348 -> a
@@ -13488,7 +13476,7 @@
     63:64:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):186:187 -> c
     63:64:void write(java.util.concurrent.ExecutorService):290 -> c
     65:80:void write(java.util.concurrent.ExecutorService):290:305 -> c
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> c
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> c
     81:81:void write(java.util.concurrent.ExecutorService):305 -> c
     82:90:void write(java.util.concurrent.ExecutorService):305:313 -> c
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
@@ -13531,7 +13519,7 @@
     1:1:int getUleb128():44:44 -> e
     1:1:int getUleb128p1():52 -> e
     1:2:int getUshort():62:63 -> f
-com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.x7:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -13560,7 +13548,7 @@
     2:2:boolean com.android.tools.r8.naming.NamingLens.hasPrefixRewritingLogic():0:0 -> a
     2:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24 -> a
     3:4:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     5:5:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     6:8:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$1 -> com.android.tools.r8.dex.d:
@@ -13574,23 +13562,23 @@
     11:14:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):63:66 -> <init>
     15:15:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):65:65 -> <init>
     boolean isNop() -> a
-    1:10:void recordMethod(com.android.tools.r8.graph.DexMethod):82:91 -> a
-    11:16:void recordField(com.android.tools.r8.graph.DexField):98:103 -> a
-    17:18:void recordClass(com.android.tools.r8.graph.DexType):109:110 -> a
-    19:19:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):124:124 -> a
-    20:22:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):116:118 -> a
-    20:22:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):124 -> a
-    23:23:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):125:125 -> a
-    24:26:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):116:118 -> a
-    24:26:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):126 -> a
-    27:66:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):149:188 -> a
-    1:3:java.lang.String convertType(com.android.tools.r8.graph.DexType):141:143 -> b
-    1:1:void keepClass(com.android.tools.r8.graph.DexType):131:131 -> c
+    1:13:void recordMethod(com.android.tools.r8.graph.DexMethod):82:94 -> a
+    14:22:void recordField(com.android.tools.r8.graph.DexField):101:109 -> a
+    23:24:void recordClass(com.android.tools.r8.graph.DexType):115:116 -> a
+    25:25:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):130:130 -> a
+    26:28:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):122:124 -> a
+    26:28:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):130 -> a
+    29:29:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):131:131 -> a
+    30:32:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):122:124 -> a
+    30:32:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):132 -> a
+    33:72:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):155:194 -> a
+    1:3:java.lang.String convertType(com.android.tools.r8.graph.DexType):147:149 -> b
+    1:1:void keepClass(com.android.tools.r8.graph.DexType):137:137 -> c
     2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):397:404 -> c
-    2:9:void keepClass(com.android.tools.r8.graph.DexType):131 -> c
+    2:9:void keepClass(com.android.tools.r8.graph.DexType):137 -> c
     10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):402:406 -> c
-    10:14:void keepClass(com.android.tools.r8.graph.DexType):131 -> c
-    15:15:void keepClass(com.android.tools.r8.graph.DexType):132:132 -> c
+    10:14:void keepClass(com.android.tools.r8.graph.DexType):137 -> c
+    15:15:void keepClass(com.android.tools.r8.graph.DexType):138:138 -> c
     1:8:boolean shouldKeep(com.android.tools.r8.graph.DexType):70:77 -> d
     9:9:boolean shouldKeep(com.android.tools.r8.graph.DexType):74:74 -> d
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.dex.e:
@@ -13600,14 +13588,14 @@
     1:5:void <init>():48:52 -> <init>
     6:6:void <init>(com.android.tools.r8.dex.CodeToKeep$1):48:48 -> <init>
 com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.dex.g:
-    1:1:void <init>():192:192 -> <init>
+    1:1:void <init>():198:198 -> <init>
     boolean isNop() -> a
     void recordClass(com.android.tools.r8.graph.DexType) -> a
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):216:216 -> a
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.s8:
+    1:1:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):222:222 -> a
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.t8:
     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
@@ -13675,12 +13663,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.O8:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.P8:
     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.k9:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.l9:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexDebugInfo info -> c
     java.nio.ByteBuffer buffer -> d
@@ -14310,7 +14298,7 @@
     8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
     8:8:void setByteOrder():98 -> h
     9:9:void setByteOrder():98:98 -> h
-com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.Ba:
     int length -> b
     int offset -> c
     int type -> a
@@ -14371,7 +14359,7 @@
     13:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):143 -> a
     14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):144:144 -> a
     15:15:int lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):139:139 -> a
-    16:16:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    16:16:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
     16:16:int lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):139 -> a
     17:24:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):278:285 -> a
     25:37:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):284:296 -> a
@@ -14753,7 +14741,7 @@
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1383:1384 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1381:1385 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexClass):1396:1399 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Zf:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
@@ -14812,7 +14800,7 @@
     102:102:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):458 -> a
     103:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):461:464 -> a
     107:107:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):453:453 -> a
-    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     108:108:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454 -> a
     109:109:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454:454 -> a
     110:110:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -14876,7 +14864,7 @@
     111:111:void markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> b
     111:111:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):654 -> b
     112:112:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    113:113:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> b
+    113:113:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> b
     113:113:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
     114:114:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649:649 -> b
     115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -14946,7 +14934,7 @@
     2:5:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):274:277 -> a
     6:7:java.util.Collection getDirectSubClasses(com.android.tools.r8.graph.DexProgramClass):262:263 -> a
     1:1:java.util.Collection lambda$addDirectSubClass$0(com.android.tools.r8.graph.DexProgramClass):276:276 -> b
-com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.Nj:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.jk:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.DexString firstJumboString -> b
     java.util.Map instructionTargets -> d
@@ -15018,10 +15006,10 @@
     407:417:com.android.tools.r8.graph.DexCode rewrite():121 -> a
     418:430:com.android.tools.r8.graph.DexCode rewrite():123:135 -> a
     com.android.tools.r8.code.Instruction lambda$replaceTarget$1(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction) -> b
-com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.Nj$a:
+com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.jk$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():297:297 -> <clinit>
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.Nj$b:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.jk$b:
     com.android.tools.r8.code.Instruction start -> a
     com.android.tools.r8.code.Instruction end -> b
     boolean endsAfterLastInstruction -> c
@@ -15031,7 +15019,7 @@
     1:5:void replaceTarget(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):71:75 -> a
     6:6:int getStartOffset():80:80 -> a
     1:4:int getStartToEndDelta():84:87 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.oq:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.Mq:
     com.android.tools.r8.dex.Marker$Tool tool -> b
     boolean $assertionsDisabled -> f
     java.lang.String D8_PREFIX -> c
@@ -15083,12 +15071,12 @@
     1:1:boolean isL8():124:124 -> n
     1:1:boolean isRelocator():128:128 -> o
     1:5:java.lang.String toString():258:262 -> toString
-com.android.tools.r8.dex.Marker$Backend -> com.android.tools.r8.internal.oq$a:
+com.android.tools.r8.dex.Marker$Backend -> com.android.tools.r8.internal.Mq$a:
     com.android.tools.r8.dex.Marker$Backend DEX -> b
     com.android.tools.r8.dex.Marker$Backend CF -> a
     1:2:void <clinit>():47:48 -> <clinit>
     1:1:void <init>(java.lang.String,int):46:46 -> <init>
-com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.oq$b:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.Mq$b:
     com.android.tools.r8.dex.Marker$Tool R8 -> b
     com.android.tools.r8.dex.Marker$Tool D8 -> a
     com.android.tools.r8.dex.Marker$Tool Relocator -> d
@@ -15096,7 +15084,7 @@
     1:4:void <clinit>():36:39 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] valuesR8andD8():42:42 -> a
-com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.mr:
+com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.Fr:
     1:1:void <init>():12:12 -> <init>
     void clearCode(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     com.android.tools.r8.graph.DexCode getCode(com.android.tools.r8.graph.DexEncodedMethod) -> a
@@ -15132,7 +15120,7 @@
     1:1:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):63 -> a
     2:2:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> a
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.bB:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -15161,14 +15149,14 @@
     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.uA:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.VA:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):420:420 -> <init>
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> b
     1:1:boolean isRenamingCandidate(int,int):425 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.vA:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.WA:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):452:452 -> <init>
     boolean isRenamingCandidate(int,int) -> b
-com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.wA:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.XA:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):354:354 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):369:369 -> a
@@ -15178,7 +15166,7 @@
     2:2:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> b
     2:2:boolean isRenamingCandidate(int,int):381 -> b
     3:3:boolean isRenamingCandidate(int,int):381:381 -> b
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.YA:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):391:391 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> a
@@ -15187,12 +15175,12 @@
     6:6:boolean handlePrefix(int,int):412:412 -> a
     7:7:boolean shouldRecordPrefix(char):406:406 -> a
     char getClassNameSeparator() -> b
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.yA:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.ZA:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):431:431 -> <init>
     char getClassNameSeparator() -> b
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> b
     1:1:boolean isRenamingCandidate(int,int):446 -> b
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.zA:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.aB:
     java.lang.StringBuilder result -> b
     java.lang.String contents -> a
     int outputFrom -> d
@@ -15649,7 +15637,7 @@
 com.android.tools.r8.dexsplitter.DexSplitter$ZipFileOrigin -> com.android.tools.r8.dexsplitter.DexSplitter$b:
     1:1:void <init>(java.nio.file.Path):79:79 -> <init>
     1:1:java.lang.String part():84:84 -> part
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.tr:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.Mr:
     java.util.Collection com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase.referencedFromContexts -> a
     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>
@@ -15662,8 +15650,8 @@
     1:3:java.lang.String com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase.getDiagnosticMessage():0 -> getDiagnosticMessage
     1:1:java.util.Collection com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase.getReferencedFromContexts():29:29 -> getReferencedFromContexts
     1:1:java.util.Collection com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase.getReferencedFromContexts():0 -> getReferencedFromContexts
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1 -> com.android.tools.r8.internal.rr:
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.sr:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1 -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.Lr:
     com.android.tools.r8.references.ClassReference classReference -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder.referencedFromContextsBuilder -> a
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1):32:32 -> <init>
@@ -15713,7 +15701,7 @@
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:void accept(com.android.tools.r8.diagnostic.MissingDefinitionContext,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):26:32 -> a
     8:13:com.android.tools.r8.diagnostic.MissingDefinitionContext create(com.android.tools.r8.graph.ProgramDerivedContext):52:57 -> a
-    14:14:com.android.tools.r8.references.ClassReference com.android.tools.r8.graph.DexClass.getClassReference():686:686 -> a
+    14:14:com.android.tools.r8.references.ClassReference com.android.tools.r8.graph.DexClass.getClassReference():690:690 -> a
     14:14:com.android.tools.r8.diagnostic.MissingDefinitionContext create(com.android.tools.r8.graph.ProgramDerivedContext):57 -> a
     15:19:com.android.tools.r8.diagnostic.MissingDefinitionContext create(com.android.tools.r8.graph.ProgramDerivedContext):57:61 -> a
     20:20:com.android.tools.r8.references.FieldReference com.android.tools.r8.graph.DexClassAndField.getFieldReference():35:35 -> a
@@ -15750,7 +15738,7 @@
     2:3:boolean validate():54:55 -> d
     2:3:com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl build():48 -> d
     4:4:com.android.tools.r8.diagnostic.internal.MissingDefinitionFieldContextImpl build():49:49 -> d
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.ur:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.Nr:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():26:28 -> <clinit>
@@ -15818,7 +15806,7 @@
     2:3:boolean validate():54:55 -> d
     2:3:com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl build():48 -> d
     4:4:com.android.tools.r8.diagnostic.internal.MissingDefinitionMethodContextImpl build():49:49 -> d
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.vr:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.Or:
     java.util.Collection missingDefinitions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -15835,8 +15823,8 @@
     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$1 -> com.android.tools.r8.internal.vr$a:
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.vr$b:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1 -> com.android.tools.r8.internal.Or$a:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.Or$b:
     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>
@@ -15902,7 +15890,7 @@
     1:1:int getCodeSize():32:32 -> getCodeSize
     1:5:java.lang.String getDiagnosticMessage():42:46 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():37:37 -> getPosition
-com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.w8:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.x8:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:1:void <init>(java.lang.String):22:22 -> <init>
@@ -15919,14 +15907,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.references.ClassReference,int):21:23 -> <init>
     1:1:int getConstantPoolSize():28:28 -> getConstantPoolSize
     1:5:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
-com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.B9:
     com.android.tools.r8.position.MethodPosition position -> a
     boolean $assertionsDisabled -> b
     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.W9:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.X9:
     java.util.Set desugaredLibraryIdentifiers -> a
     1:2:void <init>(java.util.Set):16:17 -> <init>
     1:1:java.lang.String getDiagnosticMessage():32:32 -> getDiagnosticMessage
@@ -15953,7 +15941,7 @@
     1:1:java.util.Collection getOrigins():43:43 -> getOrigins
     1:1:com.android.tools.r8.position.Position getPosition():61:61 -> getPosition
     1:1:com.android.tools.r8.references.ClassReference getType():30:30 -> getType
-com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.bc:
+com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.cc:
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String message -> a
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):16:18 -> <init>
@@ -15976,14 +15964,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.ui:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.Pi:
     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.Ei:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.Zi:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.Fi:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.aj:
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
     java.util.List methods -> b
@@ -15997,7 +15985,7 @@
     1:13:java.lang.String getDiagnosticMessage():57:69 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():52:52 -> getPosition
-com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.Ji:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.ej:
     1:1:void <init>():9:9 -> <init>
     1:1:java.lang.String getDiagnosticMessage():13:13 -> getDiagnosticMessage
 com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic -> com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic:
@@ -16010,49 +15998,49 @@
     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.lw:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Fw:
     com.android.tools.r8.position.MethodPosition position -> a
     boolean $assertionsDisabled -> b
     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.mD:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.ND:
     com.android.tools.r8.position.MethodPosition position -> a
     boolean $assertionsDisabled -> b
     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.OF:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.oG:
     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.eG:
-    1:1:void <init>():11:11 -> <init>
-    2:2:void <init>(java.lang.String):15:15 -> <init>
-    3:3:void <init>(java.lang.Throwable):19:19 -> <init>
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.EG:
+    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>
 com.android.tools.r8.errors.UnsupportedMainDexListUsageDiagnostic -> com.android.tools.r8.errors.UnsupportedMainDexListUsageDiagnostic:
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin):20:21 -> <init>
     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.Oa:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.Pa:
     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$1 -> com.android.tools.r8.internal.Oa$a:
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.Oa$b:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1 -> com.android.tools.r8.internal.Pa$a:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.Pa$b:
     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.bb:
+com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.cb:
     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.Rs:
+com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.lt:
     java.util.List dontWarnPatterns -> a
     java.util.Map matchedDontWarnPatterns -> b
     boolean $assertionsDisabled -> c
@@ -16195,7 +16183,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.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.i7:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.j7:
     java.util.Map classToFeatureSplitMap -> a
     java.util.Map representativeStringsForFeatureSplit -> b
     int $r8$clinit -> d
@@ -16224,14 +16212,14 @@
     60:60:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128:128 -> a
     60:60:boolean isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):168 -> a
     61:61:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):177:177 -> a
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     62:62:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128 -> a
     62:62:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):182 -> a
     62:62:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):177 -> a
     63:63:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128:128 -> a
     63:63:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):182 -> a
     63:63:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):177 -> a
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     64:64:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128 -> a
     64:64:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):182 -> a
     64:64:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):177 -> a
@@ -16242,7 +16230,7 @@
     69:78:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):194:203 -> a
     79:81:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):209:211 -> a
     82:83:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):213:214 -> a
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     84:84:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128 -> a
     84:84:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):157 -> a
     84:84:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):172 -> a
@@ -16252,12 +16240,12 @@
     86:86:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):157:157 -> a
     86:86:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):172 -> a
     1:1:boolean isEmpty():153:153 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.kc:
     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.jc$a:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.kc$a:
     com.android.tools.r8.DataResourceConsumer consumer -> b
     java.util.Set providers -> a
     1:3:void <init>(java.util.Set,com.android.tools.r8.DataResourceConsumer):29:31 -> <init>
@@ -16350,11 +16338,11 @@
     27:33:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):102:108 -> a
     27:33:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):83 -> a
     34:44:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):84:94 -> a
-    45:45:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> a
+    45:45:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> a
     45:45: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 -> a
     46:52: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
     53:53: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
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     54:54: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):162 -> a
     54:54: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
     55:55: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):162:162 -> a
@@ -16463,7 +16451,7 @@
     24:25:void addSynthesizedClassForLibraryDesugaring(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
     26:28:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):131:133 -> a
     29:29:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable):137:137 -> a
-    30:30:boolean com.android.tools.r8.utils.IterableUtils.isEmpty(java.lang.Iterable):92:92 -> a
+    30:30:boolean com.android.tools.r8.utils.IterableUtils.isEmpty(java.lang.Iterable):96:96 -> a
     30:30:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable):138 -> a
     31:32:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable):138:139 -> a
     33:33:void lambda$addSynthesizedClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):139:139 -> a
@@ -16473,7 +16461,7 @@
     40:41:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):173 -> a
     42:42:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):174:174 -> a
     43:46:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):217:220 -> a
-    47:47:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):500:500 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):504:504 -> a
     47:47:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):220 -> a
     48:48:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):221:221 -> a
     49:49: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:253 -> a
@@ -16484,7 +16472,7 @@
     55:55: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():104:105 -> 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):500:500 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):504:504 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):201 -> b
     8:8: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():99:99 -> c
@@ -16569,16 +16557,16 @@
     153:153:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):737:737 -> a
     153:153:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):688 -> a
     154:154:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):701:701 -> a
-    155:161: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):548:554 -> a
+    155:161: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):552:558 -> a
     155:161:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):701 -> a
-    162:164:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):570:570 -> a
-    162:164: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):561 -> a
+    162:164:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):574:574 -> a
+    162:164: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):565 -> a
     162:164:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):701 -> a
-    166:169:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):572:575 -> a
-    166:169: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):561 -> a
+    166:169:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):576:579 -> a
+    166:169: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):565 -> a
     166:169:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):701 -> a
     170:170:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):703:703 -> a
-    171:171:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> a
+    171:171:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> a
     171:171:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):706 -> a
     172:173:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):713:714 -> a
     174:175:void com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult.<init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):901:902 -> a
@@ -16595,7 +16583,7 @@
     188:190:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):481 -> a
     191:193:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):757:757 -> a
     194:200:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):766:772 -> a
-    201:201:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> a
+    201:201:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> a
     201:201:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):773 -> a
     202:202:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):797:797 -> a
     202:202:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):774 -> a
@@ -16629,9 +16617,9 @@
     60:68:boolean isInterfaceInSuperTypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList):403:411 -> b
     60:68:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):394 -> b
     69:72:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):395:398 -> b
-    73:73:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexField):515:515 -> b
-    74:77:com.android.tools.r8.graph.DexEncodedField lookupStaticTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):508:511 -> b
-    74:77:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexField):515 -> b
+    73:73:com.android.tools.r8.graph.DexClassAndField lookupStaticTarget(com.android.tools.r8.graph.DexField):515:515 -> b
+    74:77:com.android.tools.r8.graph.DexClassAndField lookupStaticTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):508:511 -> b
+    74:77:com.android.tools.r8.graph.DexClassAndField lookupStaticTarget(com.android.tools.r8.graph.DexField):515 -> b
     78:80:com.android.tools.r8.graph.ResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):608:610 -> b
     81:81:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):801:801 -> b
     82:96:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):816:830 -> b
@@ -16641,10 +16629,10 @@
     7:8:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):575 -> c
     9:18:com.android.tools.r8.graph.ResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):589:598 -> c
     19:20:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):834:835 -> c
-    21:21:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> c
+    21:21:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> c
     21:21:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):837 -> c
     22:27:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):839:844 -> c
-    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> c
+    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> c
     28:28:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):846 -> c
     29:30:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):847:848 -> c
     31:31:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):735:735 -> c
@@ -16660,7 +16648,7 @@
     2:3:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):535 -> d
     1:71:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):298:368 -> f
     1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):292:292 -> g
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):726:730 -> g
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):730:734 -> g
     2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):293 -> g
     1:1:boolean hasClassHierarchy():149:149 -> h
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():155:155 -> n
@@ -16784,8 +16772,12 @@
     1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():542:542 -> F
     1:4:boolean validateUnboxedEnumsHaveBeenPruned():552:555 -> G
     1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():532:532 -> H
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():563:563 -> I
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():567:567 -> I
     com.android.tools.r8.graph.AppView withLiveness() -> J
+    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():574:574 -> K
+    2:2:boolean hasClassHierarchy():562:562 -> K
+    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():574 -> K
+    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():574:574 -> K
     1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):155:155 -> a
     2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):150:151 -> a
     2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):156 -> a
@@ -16806,9 +16798,9 @@
     20:21:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):365:366 -> a
     22:23:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):372:373 -> a
     24:25:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):414:415 -> a
-    24:25:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):660 -> a
-    26:45:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):661:680 -> a
-    46:50:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):679:683 -> a
+    24:25:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):670 -> a
+    26:45:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):671:690 -> a
+    46:50:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):689:693 -> a
     51:52:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):414:415 -> a
     53:53:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):434:434 -> a
     54:54:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):439:439 -> a
@@ -16827,39 +16819,39 @@
     71:71:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():463:463 -> a
     71:71:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):548 -> a
     72:72:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):548:548 -> a
-    73:75:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):582:584 -> a
-    76:83:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):588:595 -> a
-    84:93:void pruneItems(com.android.tools.r8.graph.PrunedItems):603:612 -> a
-    94:94:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView):630:630 -> a
-    94:94:void pruneItems(com.android.tools.r8.graph.PrunedItems):614 -> a
+    73:75:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):592:594 -> a
+    76:83:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):598:605 -> a
+    84:93:void pruneItems(com.android.tools.r8.graph.PrunedItems):613:622 -> a
+    94:94:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView):640:640 -> a
+    94:94:void pruneItems(com.android.tools.r8.graph.PrunedItems):624 -> a
     95:95:com.android.tools.r8.graph.AppServices appServices():255:255 -> a
-    95:95:void pruneItems(com.android.tools.r8.graph.PrunedItems):616 -> a
-    96:98:void pruneItems(com.android.tools.r8.graph.PrunedItems):617:619 -> a
+    95:95:void pruneItems(com.android.tools.r8.graph.PrunedItems):626 -> a
+    96:98:void pruneItems(com.android.tools.r8.graph.PrunedItems):627:629 -> a
     99:99:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():493:493 -> a
-    99:99:void pruneItems(com.android.tools.r8.graph.PrunedItems):621 -> a
-    100:100:void pruneItems(com.android.tools.r8.graph.PrunedItems):621:621 -> a
-    101:105:void pruneItems(com.android.tools.r8.graph.PrunedItems):620:624 -> a
-    106:106:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):635:635 -> a
-    107:109:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):646:648 -> a
-    110:110:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):686:686 -> a
+    99:99:void pruneItems(com.android.tools.r8.graph.PrunedItems):631 -> a
+    100:100:void pruneItems(com.android.tools.r8.graph.PrunedItems):631:631 -> a
+    101:105:void pruneItems(com.android.tools.r8.graph.PrunedItems):630:634 -> a
+    106:106:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):645:645 -> a
+    107:109:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):656:658 -> a
+    110:110:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):696:696 -> a
     111:111:com.android.tools.r8.graph.AppServices appServices():255:255 -> a
-    111:111:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):687 -> a
-    112:112:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):687:687 -> a
+    111:111:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):697 -> a
+    112:112:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):697:697 -> a
     113:113:boolean hasInitClassLens():430:430 -> a
-    113:113:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):688 -> a
-    114:114:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):689:689 -> a
+    113:113:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):698 -> a
+    114:114:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):699:699 -> a
     115:115:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):434:434 -> a
-    115:115:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):689 -> a
-    116:116:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):691:691 -> a
+    115:115:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):699 -> a
+    116:116:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):701:701 -> a
     117:117:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():493:493 -> a
-    117:117:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):693 -> a
-    118:118:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):693:693 -> a
-    119:119:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):692:692 -> a
+    117:117:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):703 -> a
+    118:118:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):703:703 -> a
+    119:119:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):702:702 -> a
     120:120:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():481:481 -> a
-    120:120:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):695 -> a
-    121:121:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):696:696 -> a
-    122:123:void setAlreadyLibraryDesugared(java.util.Set):702:703 -> a
-    124:128:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):707:711 -> a
+    120:120:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):705 -> a
+    121:121:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):706:706 -> a
+    122:123:void setAlreadyLibraryDesugared(java.util.Set):712:713 -> a
+    124:128:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):717:721 -> a
     1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):181:181 -> b
     2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):185:185 -> b
     3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):150:151 -> b
@@ -16885,7 +16877,7 @@
     1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():211:219 -> e
     10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):267:268 -> e
     12:12:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):357:357 -> e
-    13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1240:1240 -> e
+    13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1243:1243 -> e
     13:13:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):357 -> e
     14:14:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):358:358 -> e
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():207:207 -> f
@@ -16912,7 +16904,7 @@
     1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():493:493 -> q
     1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():323:323 -> r
     1:1:com.android.tools.r8.graph.GraphLens graphLens():409:409 -> s
-    1:1:boolean hasCfByteCodePassThroughMethods():599:599 -> t
+    1:1:boolean hasCfByteCodePassThroughMethods():609:609 -> t
     1:1:boolean hasProguardCompatibilityActions():489:489 -> u
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():518:518 -> v
     1:1:com.android.tools.r8.graph.InitClassLens initClassLens():426:426 -> w
@@ -17215,7 +17207,7 @@
     1:4:void <clinit>():69:72 -> <clinit>
     1:1:void <init>(java.lang.String,int):68:68 -> <init>
     1:1:boolean isValid():75:75 -> a
-com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.Z3:
+com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.Y3:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.MethodPosition methodPosition -> b
     java.lang.String diagnosticMessage -> c
@@ -17223,11 +17215,11 @@
     1:1:java.lang.String getDiagnosticMessage():26:26 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():16:16 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():21:21 -> getPosition
-com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.b4:
+com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.a4:
     int $r8$clinit -> a
     1:1:void <init>(java.lang.String):13:13 -> <init>
     1:1:com.android.tools.r8.graph.CfCodeStackMapValidatingException error(java.lang.String):17:17 -> a
-com.android.tools.r8.graph.CfCompareHelper -> com.android.tools.r8.internal.d4:
+com.android.tools.r8.graph.CfCompareHelper -> com.android.tools.r8.internal.c4:
     boolean $assertionsDisabled -> m
     int POSITION_COMPARE_ID -> l
     com.android.tools.r8.graph.CfCode code2 -> b
@@ -17255,7 +17247,7 @@
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.graph.CfCode):18 -> a
     10:27:com.android.tools.r8.utils.structural.StructuralAcceptor labelAcceptor():80:97 -> a
     1:1:com.android.tools.r8.graph.CfCode access$200(com.android.tools.r8.graph.CfCompareHelper):18:18 -> b
-com.android.tools.r8.graph.CfCompareHelper$1 -> com.android.tools.r8.internal.c4:
+com.android.tools.r8.graph.CfCompareHelper$1 -> com.android.tools.r8.internal.b4:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels1 -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels2 -> b
     1:3:void <init>(com.android.tools.r8.graph.CfCompareHelper):82:84 -> <init>
@@ -17344,12 +17336,12 @@
     3:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):64 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     com.android.tools.r8.graph.AccessFlags self() -> x
-com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.d6:
+com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.e6:
     boolean isProgramClass() -> f
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> i
     com.android.tools.r8.graph.MethodCollection getMethodCollection() -> v
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> x
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.g6:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.h6:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> c
@@ -17362,7 +17354,7 @@
     void addDependentsToWorklist(com.android.tools.r8.graph.DexClass) -> a
     1:22:void visit(java.lang.Iterable,java.util.function.Consumer):65:86 -> a
     23:36:void visit(java.lang.Iterable,java.util.function.Consumer):69:82 -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.internal.g6:
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_PROGRAM_CLASSES -> b
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope[] $VALUES -> c
@@ -17383,7 +17375,7 @@
     1:1:com.android.tools.r8.graph.DexLibraryClass lambda$static$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):80:80 -> c
 com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.n$a:
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier) -> a
-com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.y7:
+com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.z7:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):21:21 -> a
 com.android.tools.r8.graph.ClasspathField -> com.android.tools.r8.graph.o:
     boolean $assertionsDisabled -> e
@@ -17406,15 +17398,15 @@
     3:3:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> K
     3:3:com.android.tools.r8.graph.DexClasspathClass getHolder():44 -> K
     4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():44:45 -> K
-com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.z7:
-com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.A7:
+com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.A7:
+com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.B7:
     com.android.tools.r8.graph.ProgramDerivedContext programDerivedContext -> b
     com.android.tools.r8.graph.Definition context -> a
     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 -> r
-com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.B7:
+com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.C7:
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> b
 com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.q:
     1:1:void <init>():17:17 -> <init>
@@ -17437,7 +17429,7 @@
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):44:44 -> a
     5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):99:99 -> a
     1:1:boolean estimatedSizeForInliningAtMost(int):76:76 -> g
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.l9:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.m9:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -17458,21 +17450,21 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():49:49 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     1:1:java.lang.String toString():122:122 -> toString
-com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.l9$a:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.m9$a:
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel[] $VALUES -> c
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel FULL -> b
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NAME -> a
     1:3:void <clinit>():19:21 -> <clinit>
     4:4:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.x9:
     com.android.tools.r8.graph.DefaultInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     1:1:com.android.tools.r8.graph.DefaultInitClassLens getInstance():16:16 -> c
-com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.F9:
+com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.G9:
     boolean isField() -> A
     com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext) -> a
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> b
@@ -17725,7 +17717,7 @@
     12:12:com.android.tools.r8.graph.DexMethod lambda$specify$0(com.android.tools.r8.graph.DexCallSite):49:49 -> a
     13:18:void setContext(com.android.tools.r8.graph.DexMethod,int):116:121 -> a
     19:20:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):156:157 -> a
-    21:21:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    21:21:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     21:21:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):157 -> a
     22:25:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):158:161 -> a
     26:26:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):168:168 -> a
@@ -17812,227 +17804,229 @@
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):102:102 -> <init>
     2:78:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):56:132 -> <init>
     79:79:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):122:122 -> <init>
-    1:1:boolean isInANest():1021:1021 -> A0
-    boolean isLibraryClass() -> B0
-    1:3:boolean isLocalClass():1001:1003 -> C0
-    1:3:boolean isMemberClass():1007:1009 -> D0
-    1:1:boolean isNestHost():1038:1038 -> E0
+    1:1:boolean isFinal():605:605 -> A0
+    1:1:boolean isInANest():1025:1025 -> B0
+    boolean isLibraryClass() -> C0
+    1:3:boolean isLocalClass():1005:1007 -> D0
+    1:3:boolean isMemberClass():1011:1013 -> E0
     com.android.tools.r8.graph.DexClass asDexClass() -> F
-    1:1:boolean isNestMember():1042:1042 -> F0
-    boolean isNotProgramClass() -> G0
-    1:1:boolean isPublic():665:665 -> H0
-    1:1:boolean isRecord():618:618 -> I0
-    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> I0
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isRecord():182 -> I0
-    2:2:boolean isRecord():618 -> I0
-    1:1:java.lang.Iterable members():191:191 -> J0
-    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> J0
-    2:2:java.lang.Iterable members():191 -> J0
-    1:1:java.lang.Iterable methods():204:204 -> K0
+    1:1:boolean isNestHost():1042:1042 -> F0
+    1:1:boolean isNestMember():1046:1046 -> G0
+    boolean isNotProgramClass() -> H0
+    1:1:boolean isPublic():669:669 -> I0
+    1:1:boolean isRecord():622:622 -> J0
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> J0
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isRecord():182 -> J0
+    2:2:boolean isRecord():622 -> J0
+    1:1:java.lang.Iterable members():191:191 -> K0
+    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> K0
+    2:2:java.lang.Iterable members():191 -> K0
     boolean isDexClass() -> L
-    1:5:java.util.List staticFields():319:323 -> L0
-    1:1:boolean validInterfaceSignatures():802:802 -> M0
-    2:2:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():208:208 -> M0
-    2:2:boolean validInterfaceSignatures():802 -> M0
-    3:4:boolean validInterfaceSignatures():802:803 -> M0
-    1:4:boolean verifyNoDuplicateFields():452:455 -> N0
-    1:1:java.lang.Iterable virtualMethods():241:241 -> O0
+    1:1:java.lang.Iterable methods():204:204 -> L0
+    1:5:java.util.List staticFields():323:327 -> M0
+    1:1:boolean validInterfaceSignatures():806:806 -> N0
+    2:2:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():213:213 -> N0
+    2:2:boolean validInterfaceSignatures():806 -> N0
+    3:4:boolean validInterfaceSignatures():806:807 -> N0
+    1:4:boolean verifyNoDuplicateFields():456:459 -> O0
+    1:1:java.lang.Iterable virtualMethods():245:245 -> P0
     boolean isStaticMember() -> Q
-    1:3:java.lang.Iterable allImmediateSupertypes():912:914 -> R
-    4:7:java.lang.Iterable allImmediateSupertypes():913:916 -> R
-    1:1:java.util.List allMethodsSorted():278:278 -> S
-    1:1:void clearClassSignature():964:964 -> T
-    1:1:void clearEnclosingMethodAttribute():950:950 -> U
-    1:1:void clearInnerClasses():960:960 -> V
-    1:1:void clearInstanceFields():431:431 -> W
-    1:1:void clearNestHost():1025:1025 -> X
-    1:1:void clearNestMembers():1029:1029 -> Y
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():924:925 -> Z
+    1:3:java.lang.Iterable allImmediateSupertypes():916:918 -> R
+    4:7:java.lang.Iterable allImmediateSupertypes():917:920 -> R
+    1:1:java.util.List allMethodsSorted():282:282 -> S
+    1:1:void clearClassSignature():968:968 -> T
+    1:1:void clearEnclosingMethodAttribute():954:954 -> U
+    1:1:void clearInnerClasses():964:964 -> V
+    1:1:void clearInstanceFields():435:435 -> W
+    1:1:void clearNestHost():1029:1029 -> X
+    1:1:void clearNestMembers():1033:1033 -> Y
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():928:929 -> Z
     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$6(java.util.Iterator) -> a
     1:1:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):149:149 -> a
-    2:2:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):306:306 -> a
+    2:2:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):310:310 -> a
     2:2:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):149 -> a
     3:3:void lambda$forEachClassFieldMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):149:149 -> a
     4:4:void lambda$forEachClassMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):160:160 -> a
     5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):213:213 -> a
-    6:6:void addDirectMethods(java.util.Collection):225:225 -> a
-    7:7:void setDirectMethods(java.util.List):233:233 -> a
-    8:8:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237:237 -> a
-    8:8:void setDirectMethods(java.util.List):233 -> a
-    9:9:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237:237 -> a
-    10:10:void virtualizeMethods(java.util.Set):282:282 -> a
-    11:11:void forEachField(java.util.function.Consumer):301:301 -> a
-    12:12:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):306:306 -> a
-    12:12:void forEachField(java.util.function.Consumer):301 -> a
-    13:18:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):389:394 -> a
-    19:21:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):419:421 -> a
-    22:24:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):425:427 -> a
-    25:26:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):445:446 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):467:467 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):494 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):462:462 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):495 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):523:523 -> a
-    30:30:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> a
-    30:30:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):523 -> a
-    31:31:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):529:529 -> a
-    32:32:com.android.tools.r8.graph.DexClassAndMethod toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):533:533 -> a
-    32:32:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):529 -> a
-    33:34:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):580:581 -> a
-    35:37:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):712:714 -> a
-    38:38:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):766:766 -> a
-    39:39:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):772:772 -> a
-    39:39:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):766 -> a
-    40:40:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):771:771 -> a
-    40:40:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):766 -> a
-    41:41:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):772:772 -> a
-    42:42:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):771:771 -> a
-    43:43:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):778:778 -> a
-    44:44:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):772:772 -> a
-    44:44:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):778 -> a
-    45:45:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):771:771 -> a
-    45:45:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):778 -> a
-    46:46:boolean lambda$classInitializationMayHaveSideEffectsInContext$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):779:779 -> a
-    47:50:void forEachImmediateInterface(java.util.function.BiConsumer):807:810 -> a
-    51:51:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():208:208 -> a
-    51:51:void forEachImmediateInterface(java.util.function.BiConsumer):810 -> a
-    52:61:void forEachImmediateInterface(java.util.function.BiConsumer):810:819 -> a
-    62:62:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():208:208 -> a
-    62:62:void forEachImmediateInterface(java.util.function.BiConsumer):819 -> a
-    63:69:void forEachImmediateInterface(java.util.function.BiConsumer):819:825 -> a
-    70:70:void lambda$forEachImmediateInterface$3(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):813:813 -> a
-    71:74:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):839:842 -> a
-    75:75:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():208:208 -> a
-    75:75:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):842 -> a
-    76:84:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):842:850 -> a
-    85:85:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():208:208 -> a
-    85:85:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):850 -> a
-    86:94:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):850:858 -> a
-    95:96:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():571:572 -> a
-    95:96:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):858 -> a
-    97:103:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):859:865 -> a
-    104:106:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):880:882 -> a
-    107:107:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():527:527 -> a
-    107:107:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):885 -> a
-    108:129:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):885:906 -> a
-    130:131:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):888:889 -> a
-    132:132:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():233:233 -> a
-    132:132:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):889 -> a
-    133:135:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):889:891 -> a
-    136:136:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():233:233 -> a
-    136:136:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):891 -> a
-    137:137:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):891:891 -> a
-    138:138:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():159:159 -> a
-    138:138:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):893 -> a
-    139:139:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):894:894 -> a
-    140:140:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():667:667 -> a
-    140:140:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):894 -> a
-    141:150:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):894:903 -> a
-    151:151:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):920:920 -> a
-    152:152:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):510:510 -> a
-    152:152:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):920 -> a
-    153:153:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):946:946 -> a
-    154:162:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):981:989 -> a
-    163:163:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):997:997 -> a
-    164:165:void setNestHost(com.android.tools.r8.graph.DexType):1033:1034 -> a
-    166:166:void lambda$forEachNestMember$8(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):1057:1057 -> a
-    167:167:boolean isValid(com.android.tools.r8.utils.InternalOptions):1105:1105 -> a
-    168:172:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):262:266 -> a
-    168:172:boolean isValid(com.android.tools.r8.utils.InternalOptions):1105 -> a
-    173:176:boolean isValid(com.android.tools.r8.utils.InternalOptions):1106:1109 -> a
+    6:6:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):225:225 -> a
+    7:7:void addDirectMethods(java.util.Collection):229:229 -> a
+    8:8:void setDirectMethods(java.util.List):237:237 -> a
+    9:9:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):241:241 -> a
+    9:9:void setDirectMethods(java.util.List):237 -> a
+    10:10:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):241:241 -> a
+    11:11:void virtualizeMethods(java.util.Set):286:286 -> a
+    12:12:void forEachField(java.util.function.Consumer):305:305 -> a
+    13:13:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):310:310 -> a
+    13:13:void forEachField(java.util.function.Consumer):305 -> a
+    14:19:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):393:398 -> a
+    20:22:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):423:425 -> a
+    23:25:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):429:431 -> a
+    26:27:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):449:450 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):471:471 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):498 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):466:466 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):499 -> a
+    30:30:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):527:527 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):527 -> a
+    32:32:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):533:533 -> a
+    33:33:com.android.tools.r8.graph.DexClassAndMethod toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):537:537 -> a
+    33:33:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):533 -> a
+    34:35:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):584:585 -> a
+    36:38:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):716:718 -> a
+    39:39:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):770:770 -> a
+    40:40:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):776:776 -> a
+    40:40:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):770 -> a
+    41:41:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):775:775 -> a
+    41:41:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):770 -> a
+    42:42:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):776:776 -> a
+    43:43:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):775:775 -> a
+    44:44:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):782:782 -> a
+    45:45:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):776:776 -> a
+    45:45:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):782 -> a
+    46:46:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):775:775 -> a
+    46:46:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):782 -> a
+    47:47:boolean lambda$classInitializationMayHaveSideEffectsInContext$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):783:783 -> a
+    48:51:void forEachImmediateInterface(java.util.function.BiConsumer):811:814 -> a
+    52:52:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():213:213 -> a
+    52:52:void forEachImmediateInterface(java.util.function.BiConsumer):814 -> a
+    53:62:void forEachImmediateInterface(java.util.function.BiConsumer):814:823 -> a
+    63:63:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():213:213 -> a
+    63:63:void forEachImmediateInterface(java.util.function.BiConsumer):823 -> a
+    64:70:void forEachImmediateInterface(java.util.function.BiConsumer):823:829 -> a
+    71:71:void lambda$forEachImmediateInterface$3(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):817:817 -> a
+    72:75:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):843:846 -> a
+    76:76:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():213:213 -> a
+    76:76:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):846 -> a
+    77:85:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):846:854 -> a
+    86:86:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():213:213 -> a
+    86:86:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):854 -> a
+    87:95:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):854:862 -> a
+    96:97:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():579:580 -> a
+    96:97:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):862 -> a
+    98:104:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):863:869 -> a
+    105:107:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):884:886 -> a
+    108:108:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():534:534 -> a
+    108:108:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):889 -> a
+    109:130:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):889:910 -> a
+    131:132:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):892:893 -> a
+    133:133:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():238:238 -> a
+    133:133:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):893 -> a
+    134:136:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):893:895 -> a
+    137:137:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():238:238 -> a
+    137:137:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):895 -> a
+    138:138:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):895:895 -> a
+    139:139:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():164:164 -> a
+    139:139:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):897 -> a
+    140:140:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):898:898 -> a
+    141:141:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():675:675 -> a
+    141:141:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):898 -> a
+    142:151:void lambda$applyTypeArguments$5(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):898:907 -> a
+    152:152:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):924:924 -> a
+    153:153:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):514:514 -> a
+    153:153:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):924 -> a
+    154:154:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):950:950 -> a
+    155:163:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):985:993 -> a
+    164:164:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):1001:1001 -> a
+    165:166:void setNestHost(com.android.tools.r8.graph.DexType):1037:1038 -> a
+    167:167:void lambda$forEachNestMember$8(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):1061:1061 -> a
+    168:168:boolean isValid(com.android.tools.r8.utils.InternalOptions):1109:1109 -> a
+    169:173:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):266:270 -> a
+    169:173:boolean isValid(com.android.tools.r8.utils.InternalOptions):1109 -> a
+    174:177:boolean isValid(com.android.tools.r8.utils.InternalOptions):1110:1113 -> a
     1:1:java.lang.Iterable directMethods():217:217 -> a0
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
     1:1:void forEachClassMethodMatching(java.util.function.Predicate,java.util.function.Consumer):159:159 -> b
     2:2:java.lang.Iterable directMethods(java.util.function.Predicate):221:221 -> b
-    3:3:void addVirtualMethods(java.util.Collection):249:249 -> b
-    4:4:void setVirtualMethods(java.util.List):253:253 -> b
-    5:5:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):257:257 -> b
-    5:5:void setVirtualMethods(java.util.List):253 -> b
-    6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):257:257 -> b
-    7:12:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):331:336 -> b
-    13:15:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):360:362 -> b
-    16:18:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):366:368 -> b
-    19:19:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):467:467 -> b
-    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):500:500 -> b
-    21:22:void forEachImmediateInterface(java.util.function.Consumer):789:790 -> b
-    23:26:void forEachImmediateSupertype(java.util.function.BiConsumer):830:833 -> b
-    27:27:void lambda$forEachImmediateInterfaceWithAppliedTypeArguments$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):844:844 -> b
-    28:30:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):871:873 -> b
-    31:34:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):872:875 -> b
-    35:39:java.util.List getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1095:1099 -> b
+    3:3:void addVirtualMethods(java.util.Collection):253:253 -> b
+    4:4:void setVirtualMethods(java.util.List):257:257 -> b
+    5:5:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):261:261 -> b
+    5:5:void setVirtualMethods(java.util.List):257 -> b
+    6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):261:261 -> b
+    7:12:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):335:340 -> b
+    13:15:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):364:366 -> b
+    16:18:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):370:372 -> b
+    19:19:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):471:471 -> b
+    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):504:504 -> b
+    21:22:void forEachImmediateInterface(java.util.function.Consumer):793:794 -> b
+    23:26:void forEachImmediateSupertype(java.util.function.BiConsumer):834:837 -> b
+    27:27:void lambda$forEachImmediateInterfaceWithAppliedTypeArguments$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):848:848 -> b
+    28:30:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):875:877 -> b
+    31:34:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):876:879 -> b
+    35:39:java.util.List getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1099:1103 -> b
     1:1:java.lang.Iterable fields():181:181 -> b0
     1:3:java.lang.Iterable fields(java.util.function.Predicate):185:187 -> c
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
     4:4:java.lang.Iterable fields(java.util.function.Predicate):185 -> c
-    5:14:void appendStaticFields(java.util.Collection):340:349 -> c
-    15:15:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):462:462 -> c
-    16:16:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> c
-    17:17:boolean isFinal():601:601 -> c
-    17:17:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):605 -> c
-    18:21:void forEachImmediateSupertype(java.util.function.Consumer):795:798 -> c
-    22:22:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$7(com.android.tools.r8.graph.DexEncodedField):926:926 -> c
+    5:14:void appendStaticFields(java.util.Collection):344:353 -> c
+    15:15:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):466:466 -> c
+    16:16:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> c
+    17:17:boolean isFinal():605:605 -> c
+    17:17:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):609 -> c
+    18:21:void forEachImmediateSupertype(java.util.function.Consumer):799:802 -> c
+    22:22:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$7(com.android.tools.r8.graph.DexEncodedField):930:930 -> c
     1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():165:165 -> c0
-    1:1:void forEachMethod(java.util.function.Consumer):274:274 -> d
+    1:1:void forEachMethod(java.util.function.Consumer):278:278 -> d
     2:2:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> d
-    2:2:void forEachMethod(java.util.function.Consumer):274 -> d
-    3:7:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):435:439 -> d
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):505:505 -> d
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):510:510 -> d
-    10:17:boolean isResolvable(com.android.tools.r8.graph.AppView):738:745 -> d
+    2:2:void forEachMethod(java.util.function.Consumer):278 -> d
+    3:7:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):439:443 -> d
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):509:509 -> d
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):514:514 -> d
+    10:17:boolean isResolvable(com.android.tools.r8.graph.AppView):742:749 -> d
     18:19:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):349:350 -> d
-    18:19:boolean isResolvable(com.android.tools.r8.graph.AppView):745 -> d
-    20:23:boolean isResolvable(com.android.tools.r8.graph.AppView):751:754 -> d
-    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():679:680 -> d0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):229:229 -> e
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):515:515 -> e
-    3:3:boolean isSerializable(com.android.tools.r8.graph.AppView):758:758 -> e
+    18:19:boolean isResolvable(com.android.tools.r8.graph.AppView):749 -> d
+    20:23:boolean isResolvable(com.android.tools.r8.graph.AppView):755:758 -> d
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():683:684 -> d0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):233:233 -> e
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):519:519 -> e
+    3:3:boolean isSerializable(com.android.tools.r8.graph.AppView):762:762 -> e
     4:4:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):376:376 -> e
-    4:4:boolean isSerializable(com.android.tools.r8.graph.AppView):758 -> e
-    5:6:void forEachNestMember(java.util.function.Consumer):1056:1057 -> e
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():993:993 -> e0
+    4:4:boolean isSerializable(com.android.tools.r8.graph.AppView):762 -> e
+    5:6:void forEachNestMember(java.util.function.Consumer):1060:1061 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():997:997 -> e0
     1:1:java.lang.Iterable members(java.util.function.Predicate):195:195 -> f
     2:2:java.lang.Iterable methods(java.util.function.Predicate):208:208 -> f
     2:2:java.lang.Iterable members(java.util.function.Predicate):195 -> f
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> f
     3:3:java.lang.Iterable members(java.util.function.Predicate):195 -> f
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():942:942 -> f0
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():946:946 -> f0
     1:1:java.lang.Iterable methods(java.util.function.Predicate):208:208 -> g
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():972:973 -> g0
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():976:977 -> g0
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():43:43 -> getAccessFlags
-    1:1:com.android.tools.r8.origin.Origin getOrigin():691:691 -> getOrigin
-    1:1:com.android.tools.r8.graph.DexReference getReference():625:625 -> getReference
-    1:1:com.android.tools.r8.graph.DexType getType():696:696 -> getType
-    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):954:955 -> h
-    1:1:java.util.List getInnerClasses():930:930 -> h0
+    1:1:com.android.tools.r8.origin.Origin getOrigin():695:695 -> getOrigin
+    1:1:com.android.tools.r8.graph.DexReference getReference():629:629 -> getReference
+    1:1:com.android.tools.r8.graph.DexType getType():700:700 -> getType
+    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):958:959 -> h
+    1:1:java.util.List getInnerClasses():934:934 -> h0
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> i
-    1:1:void removeInnerClasses(java.util.function.Predicate):968:968 -> i
+    1:1:void removeInnerClasses(java.util.function.Predicate):972:972 -> i
     1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():169:169 -> i0
-    1:1:boolean isInterface():610:610 -> isInterface
-    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):245:245 -> j
-    1:5:com.android.tools.r8.graph.DexType getNestHost():1046:1050 -> j0
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1061:1061 -> k0
-    1:1:java.util.List getNestMembersClassAttributes():1065:1065 -> l0
+    1:1:boolean isInterface():614:614 -> isInterface
+    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):249:249 -> j
+    1:5:com.android.tools.r8.graph.DexType getNestHost():1050:1054 -> j0
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1065:1065 -> k0
+    1:1:java.util.List getNestMembersClassAttributes():1069:1069 -> l0
     1:1:com.android.tools.r8.graph.DexString getSourceFile():177:177 -> m0
-    1:1:com.android.tools.r8.graph.DexType getSuperType():700:700 -> n0
-    1:1:java.lang.String getTypeName():1072:1072 -> o0
-    1:1:boolean hasClassInitializer():704:704 -> p0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():722:722 -> q0
-    1:1:boolean hasDefaultInitializer():708 -> q0
-    1:1:boolean hasEnclosingMethodAttribute():938:938 -> r0
-    1:2:boolean hasStaticSynchronizedMethods():1114:1115 -> s0
-    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> s0
-    3:3:boolean hasStaticSynchronizedMethods():1115 -> s0
-    1:5:java.util.List instanceFields():381:385 -> t0
-    1:1:boolean isAbstract():593:593 -> u0
+    1:1:com.android.tools.r8.graph.DexType getSuperType():704:704 -> n0
+    1:1:java.lang.String getTypeName():1076:1076 -> o0
+    1:1:boolean hasClassInitializer():708:708 -> p0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():726:726 -> q0
+    1:1:boolean hasDefaultInitializer():712 -> q0
+    1:1:boolean hasEnclosingMethodAttribute():942:942 -> r0
+    1:1:boolean hasStaticFields():1080:1080 -> s0
+    1:2:boolean hasStaticSynchronizedMethods():1118:1119 -> t0
+    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> t0
+    3:3:boolean hasStaticSynchronizedMethods():1119 -> t0
+    1:5:java.util.List instanceFields():385:389 -> u0
     1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():200:200 -> v
-    1:1:boolean isAnnotation():597:597 -> v0
-    1:4:boolean isAnonymousClass():1014:1017 -> w0
+    1:1:boolean isAbstract():597:597 -> v0
+    1:1:boolean isAnnotation():601:601 -> w0
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> x
-    boolean isClasspathClass() -> x0
-    1:1:boolean isEnum():614:614 -> y0
-    1:1:boolean isFinal():601:601 -> z0
+    1:4:boolean isAnonymousClass():1018:1021 -> x0
+    boolean isClasspathClass() -> y0
+    1:1:boolean isEnum():618:618 -> z0
 com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.z$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.A:
@@ -18081,7 +18075,7 @@
     com.android.tools.r8.graph.ClasspathMethod asClasspathMethod() -> F
     com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> G
     1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():44:44 -> H
-    1:1:com.android.tools.r8.graph.DexProto getProto():56:56 -> I
+    1:1:com.android.tools.r8.graph.DexProto getProto():60:60 -> I
     1:1:boolean isDefaultMethod():35:35 -> J
     1:2:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):24:25 -> a
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
@@ -18102,7 +18096,7 @@
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():24:24 -> <clinit>
     1:19:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):46:64 -> <init>
-    boolean isNotProgramClass() -> G0
+    boolean isNotProgramClass() -> H0
     1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):72:72 -> a
     2:5:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):136:139 -> a
     6:18:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):153:165 -> a
@@ -18164,7 +18158,7 @@
     136:140:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):412:416 -> a
     141:141:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):68:68 -> a
     141:141:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):416 -> a
-    142:142:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    142:142:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     142:142:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):70 -> a
     142:142:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):416 -> a
     143:144:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):73:74 -> a
@@ -18241,7 +18235,7 @@
     1:1:int hashCode():637:637 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():613:613 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.sa:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.ta:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -18410,14 +18404,14 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):458:458 -> a
     2:3:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):469:470 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):475:475 -> a
-    5:5:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    5:5:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):475 -> a
     6:6:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):480:480 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):501:501 -> b
-    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> b
+    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):501 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):506:506 -> b
-    4:4:void com.android.tools.r8.graph.DexString.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):62:62 -> b
+    4:4:void com.android.tools.r8.graph.DexString.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):66:66 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):506 -> b
     1:2:int hashCode():490:491 -> hashCode
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
@@ -18466,10 +18460,10 @@
     3:6:void spec(com.android.tools.r8.utils.structural.StructuralSpecification):280:283 -> a
     7:14:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):304:311 -> a
     15:16:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):317:318 -> a
-    17:17:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    17:17:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     17:17:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):318 -> a
     18:23:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):320:325 -> a
-    24:24:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    24:24:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     24:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):325 -> a
     25:25:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):331:331 -> a
     1:1:com.android.tools.r8.graph.DexString lambda$spec$1(com.android.tools.r8.graph.DexDebugEvent$StartLocal):281:281 -> b
@@ -18566,7 +18560,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():44:44 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     1:8:java.lang.String toString():85:92 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.ta:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.ua:
     1:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> g
@@ -18628,7 +18622,7 @@
     boolean isProgramClass() -> f
     1:1:com.android.tools.r8.graph.DexType getContextType():121:121 -> m
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> w
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.ua:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.va:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
     1:1:com.android.tools.r8.graph.DexClass contextIndependentDefinitionFor(com.android.tools.r8.graph.DexType):18:18 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
@@ -18659,7 +18653,7 @@
     3:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):45:46 -> a
     5:5:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):64:64 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):47 -> a
-    6:6:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    6:6:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     6:6:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):64 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):47 -> a
     7:7:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):65:65 -> a
@@ -18763,16 +18757,20 @@
     1:2:com.android.tools.r8.graph.DexValue getStaticValue():259:260 -> d0
     1:2:boolean hasExplicitStaticValue():243:244 -> e0
     1:1:boolean isDeprecated():108:108 -> f0
-    1:1:boolean isPublic():226:226 -> g0
+    1:1:boolean isEnum():205:205 -> g0
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> g0
+    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isEnum():111 -> g0
+    2:2:boolean isEnum():205 -> g0
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():30:30 -> getAccessFlags
     1:1:com.android.tools.r8.graph.DexType getType():173:173 -> getType
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> getType
     2:2:com.android.tools.r8.graph.DexType getType():173 -> getType
-    1:1:boolean isVolatile():239:239 -> h0
-    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> h0
-    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():95 -> h0
-    2:2:boolean isVolatile():239 -> h0
-    1:1:com.android.tools.r8.graph.DexType type():104:104 -> i0
+    1:1:boolean isPublic():226:226 -> h0
+    1:1:boolean isVolatile():239:239 -> i0
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):255:255 -> i0
+    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():95 -> i0
+    2:2:boolean isVolatile():239 -> i0
+    1:1:com.android.tools.r8.graph.DexType type():104:104 -> j0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():95:95 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     1:1:java.lang.String toString():159:159 -> toString
@@ -18797,7 +18795,7 @@
     16:16:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
     16:16:com.android.tools.r8.graph.DexEncodedField build():413 -> a
     17:19:com.android.tools.r8.graph.DexEncodedField build():414:416 -> a
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.va:
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.wa:
     com.android.tools.r8.graph.DexMember reference -> d
     boolean d8R8Synthesized -> c
     1:3:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexAnnotationSet,boolean):22:24 -> <init>
@@ -19014,7 +19012,7 @@
     551:551:void lambda$toStaticForwardingBridge$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1285:1285 -> a
     552:567:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1299:1314 -> a
     568:568:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1319:1319 -> a
-    569:569:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():625:625 -> a
+    569:569:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():629:629 -> a
     569:569: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):288 -> a
     569:569:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1319 -> a
     570:570:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):292:292 -> a
@@ -19086,15 +19084,12 @@
     47:47:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1290 -> b
     48:48:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1291:1291 -> b
     49:51:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic(boolean):347:349 -> b
-    49:51:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.MethodAccessFlags$Builder.setPublic(boolean):0 -> b
     49:51:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1291 -> b
     52:52:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setStatic():355:355 -> b
-    52:52:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.MethodAccessFlags$Builder.setStatic():0 -> b
     52:52:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1292 -> b
     53:53:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():360:360 -> b
     53:53:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1293 -> b
     54:54:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.AccessFlags$BuilderBase.build():365:365 -> b
-    54:54:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.MethodAccessFlags$Builder.build():0 -> b
     54:54:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1294 -> b
     55:55:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1294:1294 -> b
     56:63:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1288:1295 -> b
@@ -19238,7 +19233,7 @@
     17:17:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):102:102 -> a
     18:18:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):111:111 -> a
     19:22:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):139:142 -> a
-    23:23:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    23:23:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     23:23:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):142 -> a
     24:24:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):148:148 -> a
     25:25:boolean match(com.android.tools.r8.graph.DexField):173:173 -> a
@@ -19251,10 +19246,10 @@
     28:28:com.android.tools.r8.graph.ProgramField lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):81 -> a
     28:28:com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):21 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass):21:21 -> b
-    1:1:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):485:485 -> c
+    1:1:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):489:489 -> c
     1:1:com.android.tools.r8.graph.DexClassAndField lookupMemberOnClass(com.android.tools.r8.graph.DexClass):76 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):489:489 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):485 -> c
+    2:2:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):493:493 -> c
+    2:2:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):489 -> c
     2:2:com.android.tools.r8.graph.DexClassAndField lookupMemberOnClass(com.android.tools.r8.graph.DexClass):76 -> c
     1:1:com.android.tools.r8.graph.DexEncodedField lookupOnClass(com.android.tools.r8.graph.DexClass):71:71 -> d
     1:5:boolean computeEquals(java.lang.Object):123:127 -> g
@@ -19275,457 +19270,461 @@
     1:1:void lambda$collectAll$1(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):19:19 -> b
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.T:
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> C3
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> Q
     com.android.tools.r8.graph.DexString constructorMethodName -> b1
-    com.android.tools.r8.graph.DexType consumerType -> F2
-    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsJ$Type -> g3
-    com.android.tools.r8.graph.DexType enumerationType -> G4
+    com.android.tools.r8.graph.DexType supplierType -> F2
+    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsJ$Type -> g3
+    com.android.tools.r8.graph.DexType objectMethodsType -> G4
     java.util.concurrent.ConcurrentHashMap referenceTypes -> q
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> I0
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> W4
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> j1
     com.android.tools.r8.graph.DexString nameMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
     java.util.Map types -> c
-    com.android.tools.r8.kotlin.Kotlin kotlin -> b4
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> x4
+    com.android.tools.r8.graph.DexType annotationThrows -> x4
     com.android.tools.r8.graph.DexType enumType -> V1
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> w2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> w2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> V3
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> l4
     com.android.tools.r8.graph.DexString getFieldName -> z0
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> p4
+    com.android.tools.r8.graph.DexType annotationDefault -> p4
     com.android.tools.r8.graph.DexType charSequenceArrayType -> N1
-    com.android.tools.r8.graph.DexType javaLangSystemType -> o2
-    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> J3
+    com.android.tools.r8.graph.DexType javaLangReflectArrayType -> o2
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> G3
     com.android.tools.r8.graph.DexType boxedCharType -> F1
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> a0
     com.android.tools.r8.graph.DexString isEmptyMethodName -> R
     com.android.tools.r8.graph.DexType constructorType -> g2
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> k4
     com.android.tools.r8.graph.DexString trimName -> i0
-    boolean $assertionsDisabled -> d5
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> R4
+    boolean skipNameValidationForTesting -> d5
     com.android.tools.r8.graph.DexType byteArrayType -> w1
     com.android.tools.r8.graph.DexString fieldDescriptor -> Q0
     com.android.tools.r8.graph.DexString voidDescriptor -> B
     java.util.Map fields -> d
-    com.android.tools.r8.graph.DexType noSuchMethodErrorType -> W2
-    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> x3
+    com.android.tools.r8.graph.DexType icceType -> W2
+    com.android.tools.r8.graph.DexType androidOsBundleType -> x3
     com.android.tools.r8.graph.DexType charType -> o1
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> Y0
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> R3
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> K3
-    com.android.tools.r8.graph.DexType doubleConsumer -> O2
-    com.android.tools.r8.graph.DexType javaUtilListType -> p3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> D3
+    com.android.tools.r8.graph.DexType unsafeType -> P4
+    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> p3
     com.android.tools.r8.graph.DexString lengthMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsJ$Type -> f3
+    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsJ$Type -> f3
     com.android.tools.r8.graph.DexString enabledFieldName -> i1
-    com.android.tools.r8.graph.DexType supplierType -> E2
+    com.android.tools.r8.graph.DexType comparatorType -> E2
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> H0
-    com.android.tools.r8.graph.DexType listIteratorType -> F4
-    java.util.Set libraryMethodsReturningNonNull -> V4
-    com.android.tools.r8.graph.DexItemFactory$RecordMembers recordMembers -> N3
+    com.android.tools.r8.graph.DexType lookupType -> F4
+    com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers androidUtilSparseArrayMembers -> h4
+    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> N3
     com.android.tools.r8.graph.DexString constructorDescriptor -> P0
     com.android.tools.r8.graph.DexString ordinalMethodName -> q0
     com.android.tools.r8.graph.DexType classArrayType -> U1
-    com.android.tools.r8.graph.DexType serviceLoaderType -> v2
+    com.android.tools.r8.graph.DexType proxyType -> v2
     com.android.tools.r8.graph.DexString descriptorSeparator -> C
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> k4
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> w4
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> w4
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> d4
     com.android.tools.r8.graph.DexType charSequenceType -> M1
     com.android.tools.r8.graph.DexType stringBufferType -> n2
     java.util.Map protos -> e
-    com.android.tools.r8.graph.DexType annotationInnerClass -> o4
     com.android.tools.r8.graph.DexString newUpdaterName -> a1
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> U3
     com.android.tools.r8.graph.DexType boxedByteType -> E1
+    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> X3
     com.android.tools.r8.graph.DexType classLoaderType -> f2
     com.android.tools.r8.graph.DexString concatMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
     com.android.tools.r8.graph.DexString substringName -> h0
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Q4
     com.android.tools.r8.graph.DexString finalizeMethodName -> p0
-    com.android.tools.r8.graph.DexType icceType -> V2
-    com.android.tools.r8.graph.DexType androidOsBundleType -> w3
+    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> V2
+    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> w3
     com.android.tools.r8.graph.DexType booleanArrayType -> v1
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> D
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> h
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> X0
-    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> o3
+    com.android.tools.r8.graph.DexType bufferType -> N2
+    com.android.tools.r8.graph.DexType javaUtilComparatorType -> o3
     com.android.tools.r8.graph.DexType byteType -> n1
+    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> Z3
     java.util.Map methods -> f
-    java.util.List libraryMembersCollection -> f4
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> O4
+    com.android.tools.r8.graph.DexString unknownTypeName -> f5
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> C0
     com.android.tools.r8.graph.DexString temporaryConstructorMethodPrefix -> d1
-    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsJ$Type -> e3
-    com.android.tools.r8.graph.DexType iteratorType -> E4
+    com.android.tools.r8.graph.DexType timeConversionsType -> e3
+    com.android.tools.r8.graph.DexType callSiteType -> E4
     java.util.Map setFiles -> o
-    com.android.tools.r8.graph.DexType comparatorType -> D2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> E3
+    com.android.tools.r8.graph.DexType collectionType -> D2
     com.android.tools.r8.graph.DexString objectDescriptor -> K0
-    java.util.Set libraryClassesWithoutStaticInitialization -> Y4
+    java.util.Set libraryMethodsReturningReceiver -> Y4
     com.android.tools.r8.graph.DexString kindString -> l1
-    com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> O4
     com.android.tools.r8.graph.DexString forNameMethodName -> t0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> v4
+    com.android.tools.r8.graph.DexType annotationSignature -> v4
     com.android.tools.r8.graph.DexType objectArrayType -> T1
-    com.android.tools.r8.graph.DexType proxyType -> u2
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> T3
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> n4
+    com.android.tools.r8.graph.DexType invocationHandlerType -> u2
+    java.util.IdentityHashMap internalSentinels -> g5
+    com.android.tools.r8.graph.DexType serializedLambdaType -> n4
     com.android.tools.r8.graph.DexString unboxShortMethodName -> M
     com.android.tools.r8.graph.DexType boxedNumberType -> L1
     com.android.tools.r8.graph.DexType stringBuilderType -> m2
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> E3
     com.android.tools.r8.graph.DexString indexOfMethodName -> c0
-    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> P3
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> a5
     com.android.tools.r8.graph.DexType packageType -> e2
     com.android.tools.r8.graph.DexType boxedBooleanType -> D1
     java.util.Map setInlineFrames -> p
+    com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> Q3
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> m4
     com.android.tools.r8.graph.DexString toStringMethodName -> k0
-    java.util.Map libraryMethodsNonNullParamOrThrow -> T4
     com.android.tools.r8.graph.DexType voidType -> u1
     com.android.tools.r8.graph.DexString enumDescriptor -> S0
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> m
-    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> U2
-    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> v3
-    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> W3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> U2
+    com.android.tools.r8.graph.DexType androidOsBuildType -> v3
     com.android.tools.r8.graph.DexType booleanType -> m1
-    com.android.tools.r8.graph.DexType bufferType -> M2
-    com.android.tools.r8.graph.DexType javaUtilComparatorType -> n3
+    com.android.tools.r8.graph.DexType comparableType -> N4
+    com.android.tools.r8.graph.DexType streamType -> M2
+    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> n3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> N
     com.android.tools.r8.graph.DexString classConstructorMethodName -> c1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> g4
     com.android.tools.r8.graph.DexString getMethodName -> B0
-    com.android.tools.r8.graph.DexType collectionType -> C2
-    com.android.tools.r8.graph.DexType typeDescriptorType -> D4
-    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> F3
-    com.android.tools.r8.graph.DexType timeConversionsType -> d3
+    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> C2
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> D4
+    com.android.tools.r8.graph.DexType nullValueType -> e5
+    com.android.tools.r8.graph.DexType optionalConversionsType -> d3
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> F3
     com.android.tools.r8.graph.DexString valueString -> k1
     com.android.tools.r8.graph.DexString stringDescriptor -> J0
-    java.util.Set libraryTypesAssumedToBePresent -> X4
+    com.android.tools.r8.graph.DexItemFactory$RecordMembers recordMembers -> P3
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
     com.android.tools.r8.graph.DexType recordTagType -> S1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> t2
-    java.util.List typeSpecificBuffers -> N2
-    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> u4
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> P4
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers objectMethodsMembers -> M4
+    com.android.tools.r8.graph.DexType methodTypeType -> t2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> u4
     com.android.tools.r8.graph.DexType boxedShortType -> K1
     com.android.tools.r8.graph.DexType zipFileType -> l2
     com.android.tools.r8.graph.DexString unboxLongMethodName -> O
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> m4
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> P
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> b0
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> n
     com.android.tools.r8.graph.DexType classType -> d2
+    com.android.tools.r8.graph.DexType androidUtilSparseArrayType -> D3
+    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> S3
     java.util.concurrent.ConcurrentHashMap classTypeInterfaces -> r
     com.android.tools.r8.graph.DexType shortArrayType -> C1
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> c4
     com.android.tools.r8.graph.DexString valueOfMethodName -> j0
-    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> S4
     com.android.tools.r8.graph.DexString methodDescriptor -> R0
     java.util.Map strings -> b
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> T2
-    com.android.tools.r8.graph.DexType androidOsBuildType -> u3
+    com.android.tools.r8.graph.DexType throwableType -> T2
+    com.android.tools.r8.graph.DexType javaUtilSetType -> u3
     com.android.tools.r8.graph.DexType shortType -> t1
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> a4
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> Z0
-    com.android.tools.r8.graph.DexType streamType -> L2
-    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> m3
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> K4
+    com.android.tools.r8.graph.DexType optionalLongType -> L2
+    com.android.tools.r8.graph.DexType javaNioByteOrderType -> m3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> i4
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> R4
+    com.android.tools.r8.graph.DexType externalizableType -> M4
+    com.android.tools.r8.graph.DexType enumerationType -> K4
     com.android.tools.r8.graph.DexString assertionsDisabled -> E0
     com.android.tools.r8.graph.DexString lambdaInstanceFieldName -> f1
-    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> B2
-    com.android.tools.r8.graph.DexType optionalConversionsType -> c3
+    com.android.tools.r8.graph.DexType mapEntryType -> B2
+    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsType -> c3
     com.android.tools.r8.graph.DexString hashCodeMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.DexType objectMethodsType -> C4
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> h4
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> C4
     com.android.tools.r8.graph.DexString classDescriptor -> M0
     com.android.tools.r8.graph.DexType iterableType -> Z1
+    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> I3
     com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
-    com.android.tools.r8.graph.DexType annotationThrows -> t4
+    java.util.List typeSpecificBuffers -> O2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> t4
     com.android.tools.r8.graph.DexType recordType -> R1
-    com.android.tools.r8.graph.DexType methodTypeType -> s2
+    com.android.tools.r8.graph.DexType methodHandleType -> s2
     com.android.tools.r8.graph.DexString notifyAllMethodName -> I
+    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> b4
     com.android.tools.r8.graph.DexType boxedLongType -> J1
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> d4
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> a4
-    com.android.tools.r8.graph.DexType annotationDefault -> l4
     com.android.tools.r8.graph.DexType closeableType -> k2
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> X3
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> g4
+    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> R3
     com.android.tools.r8.graph.DexType longArrayType -> B1
     com.android.tools.r8.graph.DexString compareToMethodName -> e0
-    com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> O3
+    com.android.tools.r8.graph.DexType androidViewViewType -> C3
     com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> c2
+    boolean $assertionsDisabled -> h5
     com.android.tools.r8.graph.DexString identityHashCodeName -> Z
     com.android.tools.r8.graph.DexString convertMethodName -> m0
-    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> Y3
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> V4
     com.android.tools.r8.graph.DexType longType -> s1
     com.android.tools.r8.graph.DexString listDescriptor -> U0
-    com.android.tools.r8.graph.DexType throwableType -> S2
-    com.android.tools.r8.graph.DexType javaUtilSetType -> t3
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> S2
+    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> t3
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> J
-    com.android.tools.r8.graph.DexType unsafeType -> L4
-    com.android.tools.r8.graph.DexType optionalLongType -> K2
-    com.android.tools.r8.graph.DexType javaNioByteOrderType -> l3
-    com.android.tools.r8.graph.DexType javaIoFileType -> j3
+    java.util.Set libraryClassesWithoutStaticInitialization -> c5
+    com.android.tools.r8.graph.DexType serializableType -> L4
+    com.android.tools.r8.graph.DexType optionalIntType -> K2
+    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> l3
+    com.android.tools.r8.graph.DexType timeConversionsJ$Type -> j3
     com.android.tools.r8.graph.DexString thisName -> e1
-    com.android.tools.r8.graph.DexType optionalDoubleType -> I2
+    com.android.tools.r8.graph.DexType optionalType -> I2
     com.android.tools.r8.graph.DexString newInstanceName -> D0
-    com.android.tools.r8.graph.DexType comparableType -> J4
+    com.android.tools.r8.graph.DexType listIteratorType -> J4
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> s
-    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsType -> b3
+    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> H3
+    java.util.Set libraryMethodsReturningNonNull -> Z4
+    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsType -> b3
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> L0
-    com.android.tools.r8.graph.DexType mapEntryType -> A2
-    com.android.tools.r8.graph.DexType lookupType -> B4
+    com.android.tools.r8.graph.DexType mapType -> A2
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> B4
     com.android.tools.r8.graph.DexType collectionsType -> Y1
-    com.android.tools.r8.graph.DexType mapType -> z2
+    com.android.tools.r8.graph.DexType setType -> z2
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> o4
     com.android.tools.r8.graph.DexString getNameName -> u0
     com.android.tools.r8.graph.DexType objectType -> Q1
-    com.android.tools.r8.graph.DexType methodHandleType -> r2
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> s4
+    com.android.tools.r8.graph.DexType varHandleType -> r2
+    com.android.tools.r8.kotlin.Kotlin kotlin -> e4
+    com.android.tools.r8.graph.DexType annotationInnerClass -> s4
     com.android.tools.r8.graph.DexString unboxByteMethodName -> K
+    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> J3
     com.android.tools.r8.graph.DexType boxedIntType -> I1
     com.android.tools.r8.graph.DexType autoCloseableType -> j2
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> d0
-    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> Q3
-    com.android.tools.r8.graph.DexItemFactory$BufferMembers bufferMembers -> M3
+    java.util.Set libraryTypesAssumedToBePresent -> b5
+    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> K3
     com.android.tools.r8.graph.DexType intArrayType -> A1
     com.android.tools.r8.graph.DexType strictMathType -> b2
     com.android.tools.r8.graph.DexString internMethodName -> l0
-    com.android.tools.r8.graph.DexType androidViewViewType -> B3
-    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsType -> Z2
+    com.android.tools.r8.graph.DexType androidUtilPropertyType -> B3
+    com.android.tools.r8.graph.DexType kotlinMetadataType -> Z2
     com.android.tools.r8.graph.DexType floatArrayType -> z1
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> U4
     com.android.tools.r8.graph.DexString javaLangSystemDescriptor -> T0
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> U3
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> R2
-    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> s3
+    com.android.tools.r8.graph.DexType intConsumer -> R2
+    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> s3
     com.android.tools.r8.graph.DexType intType -> r1
+    java.util.List libraryMembersCollection -> j4
     com.android.tools.r8.graph.DexString unboxCharMethodName -> L
-    com.android.tools.r8.graph.DexType optionalIntType -> J2
-    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> k3
-    com.android.tools.r8.graph.DexType timeConversionsJ$Type -> i3
-    com.android.tools.r8.graph.DexType externalizableType -> I4
-    com.android.tools.r8.graph.DexType optionalType -> H2
+    com.android.tools.r8.graph.DexType optionalDoubleType -> J2
+    com.android.tools.r8.graph.DexType javaIoFileType -> k3
+    com.android.tools.r8.graph.DexType optionalConversionsJ$Type -> i3
+    com.android.tools.r8.graph.DexType iteratorType -> I4
+    com.android.tools.r8.graph.DexType runnableType -> H2
     com.android.tools.r8.graph.DexString containsMethodName -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
     com.android.tools.r8.graph.DexString invokeExactMethodName -> G0
     com.android.tools.r8.graph.DexString enumValuesFieldName -> h1
-    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsType -> a3
-    com.android.tools.r8.graph.DexType callSiteType -> A4
-    java.util.Set libraryMethodsReturningReceiver -> U4
+    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsType -> a3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> A4
     com.android.tools.r8.graph.DexString classArrayDescriptor -> O0
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> z4
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> z4
     com.android.tools.r8.graph.DexType objectsType -> X1
-    com.android.tools.r8.graph.DexType setType -> y2
-    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> G3
-    boolean skipNameValidationForTesting -> Z4
+    com.android.tools.r8.graph.DexType listType -> y2
+    com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> S4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> i
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> E
     com.android.tools.r8.graph.DexString getTypeNameName -> x0
-    com.android.tools.r8.graph.DexType annotationSignature -> r4
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> r4
     com.android.tools.r8.graph.DexType stringArrayType -> P1
-    com.android.tools.r8.graph.DexType varHandleType -> q2
-    com.android.tools.r8.graph.DexString unknownTypeName -> b5
+    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> q2
+    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> L3
     java.util.Map methodHandles -> g
-    com.android.tools.r8.graph.DexType serializedLambdaType -> j4
     com.android.tools.r8.graph.DexType methodType -> i2
     com.android.tools.r8.graph.DexType boxedFloatType -> H1
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> i4
     com.android.tools.r8.graph.DexString startsWithMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString cloneMethodName -> g0
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> f4
     com.android.tools.r8.graph.DexType mathType -> a2
-    java.util.IdentityHashMap internalSentinels -> c5
-    com.android.tools.r8.graph.DexType androidUtilPropertyType -> A3
+    com.android.tools.r8.graph.DexType androidUtilLogType -> A3
     com.android.tools.r8.graph.DexType doubleArrayType -> y1
     com.android.tools.r8.graph.DexString getClassMethodName -> o0
-    com.android.tools.r8.graph.DexType kotlinMetadataType -> Y2
-    com.android.tools.r8.graph.DexType androidUtilLogType -> z3
+    com.android.tools.r8.graph.DexType npeType -> Y2
+    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> z3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> j
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> F
     com.android.tools.r8.graph.DexType floatType -> q1
     com.android.tools.r8.graph.DexString throwableDescriptor -> W0
-    com.android.tools.r8.graph.DexType intConsumer -> Q2
-    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> r3
-    com.android.tools.r8.graph.DexType runnableType -> G2
-    com.android.tools.r8.graph.DexType serializableType -> H4
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> N4
-    com.android.tools.r8.graph.DexType optionalConversionsJ$Type -> h3
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> M3
+    com.android.tools.r8.graph.DexType longConsumer -> Q2
+    com.android.tools.r8.graph.DexType javaUtilLocaleType -> r3
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> T3
+    com.android.tools.r8.graph.DexType consumerType -> G2
+    com.android.tools.r8.graph.DexType typeDescriptorType -> H4
+    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsJ$Type -> h3
     com.android.tools.r8.graph.DexString javacLambdaMethodPrefix -> g1
     com.android.tools.r8.graph.DexString invokeMethodName -> F0
     com.android.tools.r8.graph.DexString endsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexType nullValueType -> a5
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> N0
-    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> L3
+    java.util.Map libraryMethodsNonNullParamOrThrow -> X4
     com.android.tools.r8.graph.DexType annotationType -> W1
-    com.android.tools.r8.graph.DexType listType -> x2
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> k
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> y4
+    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> y4
     com.android.tools.r8.graph.DexString waitMethodName -> G
     com.android.tools.r8.graph.DexString getSimpleNameName -> w0
     com.android.tools.r8.graph.DexType stringType -> O1
-    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> p2
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> q4
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> Z3
-    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> H3
+    com.android.tools.r8.graph.DexType javaLangSystemType -> p2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> q4
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> T4
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers objectMethodsMembers -> Q4
     com.android.tools.r8.graph.DexType fieldType -> h2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> S3
     com.android.tools.r8.graph.DexType boxedDoubleType -> G1
-    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> V3
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> f0
-    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> I3
+    com.android.tools.r8.graph.DexItemFactory$BufferMembers bufferMembers -> O3
     com.android.tools.r8.graph.DexString equalsMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
     java.util.Set possibleCompilerSynthesizedTypes -> a
     com.android.tools.r8.graph.DexString wrapperFieldName -> n0
-    com.android.tools.r8.graph.DexType npeType -> X2
-    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> y3
+    com.android.tools.r8.graph.DexType noSuchMethodErrorType -> X2
+    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> y3
     com.android.tools.r8.graph.DexType charArrayType -> x1
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> W3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> l
+    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> W4
     com.android.tools.r8.graph.DexString arraysDescriptor -> V0
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> c4
     com.android.tools.r8.graph.DexString notifyMethodName -> H
-    com.android.tools.r8.graph.DexType longConsumer -> P2
-    com.android.tools.r8.graph.DexType javaUtilLocaleType -> q3
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> e4
+    com.android.tools.r8.graph.DexType doubleConsumer -> P2
+    com.android.tools.r8.graph.DexType javaUtilListType -> q3
     com.android.tools.r8.graph.DexType doubleType -> p1
+    com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers javaLangReflectArrayMembers -> Y3
     1:47:void <clinit>():64:110 -> <clinit>
     1:1:void <init>():114:114 -> <init>
-    2:630:void <init>():72:700 -> <init>
-    631:679:void <init>():690:738 -> <init>
-    680:696:void <init>():728:744 -> <init>
-    697:782:void <init>():741:826 -> <init>
-    783:783:void <init>():115:115 -> <init>
+    2:638:void <init>():72:708 -> <init>
+    639:687:void <init>():698:746 -> <init>
+    688:704:void <init>():736:752 -> <init>
+    705:790:void <init>():749:834 -> <init>
+    791:791:void <init>():115:115 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$7(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):119:119 -> a
     2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):200:200 -> a
-    2:2:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2147 -> a
-    3:3:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2147:2147 -> a
+    2:2:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2173 -> a
+    3:3:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2173:2173 -> a
     4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):300:300 -> a
-    4:4:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2162 -> a
-    5:5:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2162:2162 -> a
-    6:17:java.util.Set boxedValueOfMethods():713:724 -> a
-    18:20:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):716:718 -> a
-    21:21:void setSkipNameValidationForTesting(boolean):829:829 -> a
-    22:22:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1972:1972 -> a
+    4:4:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2188 -> a
+    5:5:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2188:2188 -> a
+    6:17:java.util.Set boxedValueOfMethods():721:732 -> a
+    18:20:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):724:726 -> a
+    21:21:void setSkipNameValidationForTesting(boolean):837:837 -> a
+    22:22:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1998:1998 -> a
     23:23:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):119:119 -> a
-    23:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1973 -> a
-    24:25:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1973:1974 -> a
-    26:26:com.android.tools.r8.graph.DexString createString(int,byte[]):1980:1980 -> a
-    27:29:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1993:1995 -> a
-    30:30:java.lang.String escapeMemberString(java.lang.String):1989:1989 -> a
-    30:30:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1995 -> a
-    31:38:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1995:2002 -> a
-    39:43:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2015:2019 -> a
-    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2043:2043 -> a
-    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):2056 -> a
-    45:45:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2204:2204 -> a
-    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2044 -> a
-    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):2056 -> a
-    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2046:2046 -> a
-    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):2056 -> a
-    47:47:com.android.tools.r8.graph.DexMethod createFreshMethodName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2086:2086 -> a
-    48:52:java.util.Optional lambda$createFreshMethodName$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2088:2092 -> a
-    53:53:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2109:2109 -> a
-    54:58:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2111:2115 -> a
-    59:59:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,java.util.function.Predicate):2128:2128 -> a
-    60:60:com.android.tools.r8.graph.DexField createFreshFieldNameWithHolderSuffix(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2141:2141 -> a
-    61:61:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2158:2158 -> a
+    23:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1999 -> a
+    24:25:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1999:2000 -> a
+    26:26:com.android.tools.r8.graph.DexString createString(int,byte[]):2006:2006 -> a
+    27:29:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2019:2021 -> a
+    30:30:java.lang.String escapeMemberString(java.lang.String):2015:2015 -> a
+    30:30:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2021 -> a
+    31:38:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2021:2028 -> a
+    39:43:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2041:2045 -> a
+    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2069:2069 -> a
+    44:44:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):2082 -> a
+    45:45:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2230:2230 -> a
+    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2070 -> a
+    45:45:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):2082 -> a
+    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2072:2072 -> a
+    46:46:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):2082 -> a
+    47:47:com.android.tools.r8.graph.DexMethod createFreshMethodName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2112:2112 -> a
+    48:52:java.util.Optional lambda$createFreshMethodName$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2114:2118 -> a
+    53:53:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2135:2135 -> a
+    54:58:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2137:2141 -> a
+    59:59:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,java.util.function.Predicate):2154:2154 -> a
+    60:60:com.android.tools.r8.graph.DexField createFreshFieldNameWithHolderSuffix(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2167:2167 -> a
+    61:61:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2184:2184 -> a
     62:62:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):275:275 -> a
-    62:62:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2158 -> a
-    63:64:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2158:2159 -> a
-    65:65:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2167:2167 -> a
+    62:62:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2184 -> a
+    63:64:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2184:2185 -> a
+    65:65:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2193:2193 -> a
     66:66:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):275:275 -> a
-    66:66:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2167 -> a
-    67:70:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2167:2170 -> a
-    71:71:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2168:2168 -> a
-    72:91:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2176:2195 -> a
-    92:92:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2194:2194 -> a
-    93:93:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2244:2244 -> a
-    94:96:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2248:2250 -> a
-    94:96:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2243 -> a
-    97:101:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2269:2273 -> a
-    102:103:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2299:2300 -> a
-    104:106:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):2304:2306 -> a
-    107:107:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2310:2310 -> a
-    108:109:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):2315:2316 -> a
-    110:113:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2320:2323 -> a
-    114:119:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2398:2403 -> a
-    114:119:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2324 -> a
-    120:120:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2321:2321 -> a
-    121:121:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2328:2328 -> a
-    122:125:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2342:2345 -> a
-    126:128:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2344:2346 -> a
-    129:131:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2350:2352 -> a
-    132:135:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2351:2354 -> a
-    136:140:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2364:2368 -> a
-    141:150:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2385:2394 -> a
-    141:150:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2368 -> a
-    151:157:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2369:2375 -> a
-    158:162:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2374:2378 -> a
-    163:165:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2407:2409 -> a
-    166:166:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2413:2413 -> a
-    167:169:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2429:2431 -> a
-    167:169:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2420 -> a
-    170:172:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2429:2431 -> a
-    173:174:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2440:2441 -> a
-    175:184:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2449:2458 -> a
-    185:187:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2466:2468 -> a
-    188:190:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2504:2506 -> a
-    191:193:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2511:2513 -> a
-    194:194:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2521:2521 -> a
-    195:202: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):2554:2561 -> a
-    203:231: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):2560:2588 -> a
-    232:240:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2568:2576 -> a
-    241:252:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2575:2586 -> a
-    253:253:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2593:2593 -> a
-    254:255:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2596:2597 -> a
-    256:256:void forAllTypes(java.util.function.Consumer):2603:2603 -> a
+    66:66:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2193 -> a
+    67:70:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2193:2196 -> a
+    71:71:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2194:2194 -> a
+    72:91:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2202:2221 -> a
+    92:92:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2220:2220 -> a
+    93:93:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2270:2270 -> a
+    94:96:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2274:2276 -> a
+    94:96:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2269 -> a
+    97:101:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2295:2299 -> a
+    102:103:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2325:2326 -> a
+    104:106:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):2330:2332 -> a
+    107:107:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2336:2336 -> a
+    108:109:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):2341:2342 -> a
+    110:113:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2346:2349 -> a
+    114:119:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2424:2429 -> a
+    114:119:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2350 -> a
+    120:120:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2347:2347 -> a
+    121:121:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2354:2354 -> a
+    122:125:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2368:2371 -> a
+    126:128:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2370:2372 -> a
+    129:131:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2376:2378 -> a
+    132:135:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2377:2380 -> a
+    136:140:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2390:2394 -> a
+    141:150:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2411:2420 -> a
+    141:150:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2394 -> a
+    151:157:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2395:2401 -> a
+    158:162:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2400:2404 -> a
+    163:165:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2433:2435 -> a
+    166:166:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2439:2439 -> a
+    167:169:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2455:2457 -> a
+    167:169:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2446 -> a
+    170:172:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2455:2457 -> a
+    173:174:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2466:2467 -> a
+    175:184:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2475:2484 -> a
+    185:187:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2492:2494 -> a
+    188:190:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2530:2532 -> a
+    191:193:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2537:2539 -> a
+    194:194:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2547:2547 -> a
+    195:202: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):2580:2587 -> a
+    203:234: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):2586:2617 -> a
+    235:246:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2594:2605 -> a
+    247:261:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2601:2615 -> a
+    262:262:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2622:2622 -> a
+    263:264:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2625:2626 -> a
+    265:265:void forAllTypes(java.util.function.Consumer):2632:2632 -> a
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):300:300 -> b
-    1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2171 -> 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):2171:2171 -> b
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):703:704 -> b
-    5:6:java.util.Map buildLibraryMethodsNonNullParamOrThrow():753:754 -> b
-    7:7:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1357:1357 -> b
-    7:7:java.util.Map buildLibraryMethodsNonNullParamOrThrow():754 -> b
-    8:11:java.util.Map buildLibraryMethodsNonNullParamOrThrow():754:757 -> b
-    12:15:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2146:2146 -> b
-    16:16:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2195:2195 -> b
-    17:17:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2200:2200 -> b
-    18:18:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2239:2239 -> b
-    19:21:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2248:2250 -> b
-    19:21:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2239 -> b
-    22:24:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2248:2250 -> b
-    25:25:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2282:2282 -> b
-    26:28:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2472:2474 -> b
-    29:29:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2517:2517 -> b
-    1:1:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):708:708 -> c
-    2:2:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):837:837 -> c
-    3:4:com.android.tools.r8.graph.DexString createString(java.lang.String):1984:1985 -> c
-    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2287:2287 -> c
-    6:8:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2332:2334 -> c
-    9:11:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2478:2480 -> c
-    12:14:void clearTypeElementsCache():2525:2527 -> c
-    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2223:2231 -> d
-    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2228:2228 -> d
+    1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2197 -> 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):2197:2197 -> b
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):711:712 -> b
+    5:6:java.util.Map buildLibraryMethodsNonNullParamOrThrow():761:762 -> b
+    7:7:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1372:1372 -> b
+    7:7:java.util.Map buildLibraryMethodsNonNullParamOrThrow():762 -> b
+    8:11:java.util.Map buildLibraryMethodsNonNullParamOrThrow():762:765 -> b
+    12:15:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2172:2172 -> b
+    16:16:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2221:2221 -> b
+    17:17:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2226:2226 -> b
+    18:18:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2265:2265 -> b
+    19:21:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2274:2276 -> b
+    19:21:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2265 -> b
+    22:24:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2274:2276 -> b
+    25:25:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2308:2308 -> b
+    26:28:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2498:2500 -> b
+    29:29:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2543:2543 -> b
+    1:1:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):716:716 -> c
+    2:2:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):845:845 -> c
+    3:4:com.android.tools.r8.graph.DexString createString(java.lang.String):2010:2011 -> c
+    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2313:2313 -> c
+    6:8:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2358:2360 -> c
+    9:11:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2504:2506 -> c
+    12:14:void clearTypeElementsCache():2551:2553 -> c
+    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2249:2257 -> d
+    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2254:2254 -> d
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):119:119 -> d
-    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2232 -> d
-    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2232:2233 -> d
-    14:15:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2257:2258 -> d
-    16:16:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2278:2278 -> d
-    17:17:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2338:2338 -> d
-    18:20:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2484:2486 -> d
-    21:21:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2496:2496 -> d
-    1:1:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2265:2265 -> e
-    2:2:com.android.tools.r8.graph.DexType createType(java.lang.String):2291:2291 -> e
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):2295:2295 -> e
-    4:6:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2490:2492 -> e
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2500:2500 -> e
-    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2204:2204 -> f
-    2:6:java.util.List extractMarkers():2211:2215 -> f
-    1:1:boolean getSkipNameValidationForTesting():833:833 -> g
-    1:3:boolean verifyNoCachedTypeElements():2531:2533 -> h
+    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2258 -> d
+    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2258:2259 -> d
+    14:15:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2283:2284 -> d
+    16:16:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2304:2304 -> d
+    17:17:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2364:2364 -> d
+    18:20:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2510:2512 -> d
+    21:21:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2522:2522 -> d
+    1:1:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2291:2291 -> e
+    2:2:com.android.tools.r8.graph.DexType createType(java.lang.String):2317:2317 -> e
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):2321:2321 -> e
+    4:6:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2516:2518 -> e
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2526:2526 -> e
+    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2230:2230 -> f
+    2:6:java.util.List extractMarkers():2237:2241 -> f
+    1:1:boolean getSkipNameValidationForTesting():841:841 -> g
+    1:3:boolean verifyNoCachedTypeElements():2557:2559 -> h
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.T$a:
 com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.graph.T$b:
     com.android.tools.r8.graph.DexField TYPE -> q
@@ -19745,46 +19744,50 @@
     com.android.tools.r8.graph.DexField BOOTLOADER -> a
     com.android.tools.r8.graph.DexField CPU_ABI2 -> d
     com.android.tools.r8.graph.DexField CPU_ABI -> c
-    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):845:867 -> <init>
-    1:17:void forEachFinalField(java.util.function.Consumer):871:887 -> a
+    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):853:875 -> <init>
+    1:17:void forEachFinalField(java.util.function.Consumer):879:895 -> a
 com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.graph.T$c:
     com.android.tools.r8.graph.DexField SECURITY_PATCH -> e
     com.android.tools.r8.graph.DexField RELEASE -> b
     com.android.tools.r8.graph.DexField CODENAME -> a
     com.android.tools.r8.graph.DexField SDK_INT -> d
     com.android.tools.r8.graph.DexField SDK -> c
-    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):891:898 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):902:906 -> a
+    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):899:906 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):910:914 -> a
 com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.graph.T$d:
     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):910:914 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):918:919 -> a
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):918:922 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):926:927 -> a
 com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.graph.T$e:
     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):923:926 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):930:931 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.graph.T$f:
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):931:934 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):938:939 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.graph.T$f:
+    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):966:970 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.graph.T$g:
     com.android.tools.r8.graph.DexField SELECTED_STATE_SET -> e
     com.android.tools.r8.graph.DexField EMPTY_STATE_SET -> b
     com.android.tools.r8.graph.DexField TRANSLATION_Z -> a
     com.android.tools.r8.graph.DexField PRESSED_ENABLED_STATE_SET -> d
     com.android.tools.r8.graph.DexField ENABLED_STATE_SET -> c
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):935:946 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):950:954 -> a
-com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.T$g:
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):943:954 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):958:962 -> a
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.T$h:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1237:1237 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1241:1246 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.T$h:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1252:1252 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1256:1261 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.T$i:
     java.util.Set updaters -> b
     com.android.tools.r8.graph.DexMethod referenceUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1604:1604 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1610:1629 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1633:1633 -> a
-com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.T$i:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1630:1630 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1636:1655 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1659:1659 -> a
+com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.T$j:
     com.android.tools.r8.graph.DexField TRUE -> b
     com.android.tools.r8.graph.DexMethod toString -> g
     com.android.tools.r8.graph.DexField FALSE -> a
@@ -19792,24 +19795,24 @@
     com.android.tools.r8.graph.DexMethod parseBoolean -> e
     com.android.tools.r8.graph.DexField TYPE -> c
     com.android.tools.r8.graph.DexMethod booleanValue -> d
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):958:958 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):973:973 -> <init>
-    3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):960:971 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):977:979 -> a
-com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.graph.T$j:
-    java.util.List bufferCovariantMethods -> a
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1312:1323 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.T$k:
-    com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):983:983 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):973:973 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):988:988 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):985:986 -> <init>
-com.android.tools.r8.graph.DexItemFactory$CharMembers -> com.android.tools.r8.graph.T$l:
+    3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):975:986 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):992:994 -> a
+com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.graph.T$k:
+    java.util.List bufferCovariantMethods -> a
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1327:1338 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.T$l:
     com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):991:991 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):996:996 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):993:994 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.T$m:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):998:998 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1003:1003 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1000:1001 -> <init>
+com.android.tools.r8.graph.DexItemFactory$CharMembers -> com.android.tools.r8.graph.T$m:
+    com.android.tools.r8.graph.DexMethod toString -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1006:1006 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1011:1011 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1008:1009 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.T$n:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getPackage -> k
     com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> j
@@ -19824,23 +19827,23 @@
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
     java.util.Set getMembers -> m
     java.util.Set getNames -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1362:1362 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1385:1385 -> <init>
-    3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1367:1426 -> <init>
-    1:1:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1430:1430 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1434:1434 -> b
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.T$n:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1377:1377 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1400:1400 -> <init>
+    3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1382:1441 -> <init>
+    1:1:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1445:1445 -> a
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1449:1449 -> b
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.T$o:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1442:1442 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1446:1448 -> <init>
-com.android.tools.r8.graph.DexItemFactory$DoubleMembers -> com.android.tools.r8.graph.T$o:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1457:1457 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1461:1463 -> <init>
+com.android.tools.r8.graph.DexItemFactory$DoubleMembers -> com.android.tools.r8.graph.T$p:
     com.android.tools.r8.graph.DexMethod toString -> b
     com.android.tools.r8.graph.DexMethod isNaN -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1169:1169 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1176:1176 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1173:1180 -> <init>
-    11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1178:1178 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.T$p:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1184:1184 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1191:1191 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1188:1195 -> <init>
+    11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1193:1193 -> <init>
+com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.T$q:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethod finalize -> k
     com.android.tools.r8.graph.DexMethod constructor -> j
@@ -19854,72 +19857,76 @@
     com.android.tools.r8.graph.DexField ordinalField -> b
     com.android.tools.r8.graph.DexField nameField -> a
     com.android.tools.r8.graph.DexItemFactory this$0 -> l
-    1:1:void <clinit>():1469:1469 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1469:1469 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1487:1487 -> <init>
-    3:46:void <init>(com.android.tools.r8.graph.DexItemFactory):1471:1514 -> <init>
-    1:1:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1527:1527 -> a
+    1:1:void <clinit>():1495:1495 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1495:1495 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1513:1513 -> <init>
+    3:46:void <init>(com.android.tools.r8.graph.DexItemFactory):1497:1540 -> <init>
+    1:1:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1553:1553 -> a
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    2:2:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1527 -> a
-    3:4:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1527:1528 -> a
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():205:205 -> a
-    5:5:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1528 -> a
-    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():209:209 -> a
-    6:6:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1528 -> a
-    1:1:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1532:1532 -> b
+    2:2:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1553 -> a
+    3:4:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1553:1554 -> a
+    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():209:209 -> a
+    5:5:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1554 -> a
+    1:1:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1558:1558 -> b
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> b
-    2:2:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1532 -> b
-    3:5:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1532:1534 -> b
+    2:2:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1558 -> b
+    3:5:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1558:1560 -> b
     6:6:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():235:235 -> b
-    6:6:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1535 -> b
+    6:6:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1561 -> b
     7:7:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():209:209 -> b
-    7:7:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1536 -> b
-com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.T$q:
+    7:7:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1562 -> b
+com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.T$r:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):999:999 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1006:1006 -> <init>
-    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1001:1004 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1010:1010 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.graph.T$r:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1014:1014 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1021:1021 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1016:1019 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1025:1025 -> a
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.graph.T$s:
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1548:1552 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1551:1551 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.graph.T$s:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1574:1578 -> <init>
+    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1577:1577 -> <init>
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.graph.T$t:
     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):1186:1191 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1195:1195 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.graph.T$t:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1201:1206 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1210:1210 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.graph.T$u:
     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):1014:1017 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1021:1022 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.T$u:
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1029:1032 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1036:1037 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers -> com.android.tools.r8.graph.T$v:
+    com.android.tools.r8.graph.DexMethod newInstanceMethodWithDimensions -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1471:1471 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1479:1479 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1473:1476 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1474:1474 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.T$w:
     com.android.tools.r8.graph.DexMethod identityHashCode -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1456:1456 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1459:1461 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.graph.T$v:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1482:1482 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1485:1487 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.graph.T$x:
     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):1026:1030 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1034:1035 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.graph.T$w:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1041:1045 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1049:1050 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.graph.T$y:
     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):1039:1044 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1048:1049 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.T$x:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1054:1059 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1063:1064 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.T$z:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1053:1053 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1057:1061 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1059:1059 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.graph.T$y:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1068:1068 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1072:1076 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1074:1074 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.graph.T$A:
     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):1067:1072 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1076:1077 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.graph.T$z:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1082:1087 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1091:1092 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.graph.T$B:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
     com.android.tools.r8.graph.DexField SECONDS -> g
@@ -19927,39 +19934,39 @@
     com.android.tools.r8.graph.DexField DAYS -> a
     com.android.tools.r8.graph.DexField MILLISECONDS -> d
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
-    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1081:1096 -> <init>
-    1:7:void forEachFinalField(java.util.function.Consumer):1100:1106 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.graph.T$A:
+    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1096:1111 -> <init>
+    1:7:void forEachFinalField(java.util.function.Consumer):1115:1121 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.graph.T$C:
     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):1110:1114 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):1118:1120 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.graph.T$B:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1125:1129 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):1133:1135 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.graph.T$D:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
     com.android.tools.r8.graph.DexField FINE -> b
     com.android.tools.r8.graph.DexField CONFIG -> a
     com.android.tools.r8.graph.DexField FINEST -> d
     com.android.tools.r8.graph.DexField FINER -> c
-    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1124:1137 -> <init>
-    1:6:void forEachFinalField(java.util.function.Consumer):1141:1146 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.graph.T$C:
-    1:1:void <init>():840:840 -> <init>
+    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1139:1152 -> <init>
+    1:6:void forEachFinalField(java.util.function.Consumer):1156:1161 -> a
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.graph.T$E:
+    1:1:void <init>():848:848 -> <init>
     void forEachFinalField(java.util.function.Consumer) -> a
-com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.T$D:
+com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.T$F:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1150:1150 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1158:1158 -> <init>
-    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1152:1160 -> <init>
-    12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1159:1159 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1165:1165 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.T$E:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1165:1165 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1173:1173 -> <init>
+    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1167:1175 -> <init>
+    12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1174:1174 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1180:1180 -> a
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.T$G:
     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):1540:1545 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.T$F:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1566:1571 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.T$H:
     com.android.tools.r8.graph.DexMethod toString -> i
     com.android.tools.r8.graph.DexMethod finalize -> h
     com.android.tools.r8.graph.DexField clinitField -> b
@@ -19969,26 +19976,26 @@
     com.android.tools.r8.graph.DexMethod getClass -> e
     com.android.tools.r8.graph.DexMethod equals -> d
     com.android.tools.r8.graph.DexMethod clone -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1274:1274 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1298:1298 -> <init>
-    3:30:void <init>(com.android.tools.r8.graph.DexItemFactory):1280:1307 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.graph.T$G:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1289:1289 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1313:1313 -> <init>
+    3:30:void <init>(com.android.tools.r8.graph.DexItemFactory):1295:1322 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.graph.T$I:
     com.android.tools.r8.graph.DexMethod bootstrap -> a
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1259:1270 -> <init>
-    13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1263:1263 -> <init>
-    14:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1261:1261 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.T$H:
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1274:1285 -> <init>
+    13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1278:1278 -> <init>
+    14:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1276:1276 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.T$J:
     com.android.tools.r8.graph.DexMethod toStringWithObject -> d
     com.android.tools.r8.graph.DexMethod requireNonNullWithMessageSupplier -> c
     com.android.tools.r8.graph.DexMethod requireNonNullWithMessage -> b
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1326:1326 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1334:1334 -> <init>
-    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1331:1341 -> <init>
-    14:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1339:1346 -> <init>
-    22:22:void <init>(com.android.tools.r8.graph.DexItemFactory):1344:1344 -> <init>
-    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1351:1351 -> a
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.T$I:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1341:1341 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1349:1349 -> <init>
+    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1346:1356 -> <init>
+    14:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1354:1361 -> <init>
+    22:22:void <init>(com.android.tools.r8.graph.DexItemFactory):1359:1359 -> <init>
+    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1366:1366 -> a
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.T$K:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -19996,41 +20003,41 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1860:1895 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1903:1913 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1920:1925 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.T$J:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1886:1921 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1929:1939 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1946:1951 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.T$L:
     java.util.Map boxedFieldTypeToPrimitiveType -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1561:1561 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1573:1592 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1596:1596 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.T$K:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1587:1587 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1599:1618 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1622:1622 -> a
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.T$M:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1929:1929 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1933:1938 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1935:1935 -> <init>
-com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.graph.T$L:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1955:1955 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1959:1964 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1961:1961 -> <init>
+com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.graph.T$N:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod hashCode -> c
     com.android.tools.r8.graph.DexMethod equals -> b
     com.android.tools.r8.graph.DexMethod init -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1251:1256 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.T$M:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1266:1271 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.T$O:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1942:1942 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1949:1955 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1953:1961 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1958:1963 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1967:1967 -> a
-com.android.tools.r8.graph.DexItemFactory$ShortMembers -> com.android.tools.r8.graph.T$N:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1968:1968 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1975:1981 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1979:1987 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1984:1989 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1993:1993 -> a
+com.android.tools.r8.graph.DexItemFactory$ShortMembers -> com.android.tools.r8.graph.T$P:
     com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1637:1637 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1642:1642 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1639:1640 -> <init>
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.T$O:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1663:1663 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1668:1668 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1665:1666 -> <init>
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.T$Q:
     com.android.tools.r8.graph.DexMethod toString -> m
     com.android.tools.r8.graph.DexMethod stringConstructor -> l
     com.android.tools.r8.graph.DexMethod intConstructor -> k
@@ -20049,20 +20056,20 @@
     java.util.Set constructorMethods -> p
     java.util.Set appendMethods -> n
     com.android.tools.r8.graph.DexItemFactory this$0 -> q
-    1:1:void <clinit>():1731:1731 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1731:1731 -> <init>
-    2:48:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1755:1801 -> <init>
-    1:1:java.util.Set access$2200(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1731:1731 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1808:1808 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):1829:1855 -> a
-    1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):1816:1816 -> b
-com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.graph.T$P:
+    1:1:void <clinit>():1757:1757 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1757:1757 -> <init>
+    2:48:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1781:1827 -> <init>
+    1:1:java.util.Set access$2300(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1757:1757 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1834:1834 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):1855:1881 -> a
+    1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):1842:1842 -> b
+com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.graph.T$R:
     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):1199:1205 -> <init>
-    8:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1202:1211 -> <init>
-    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1207:1207 -> <init>
-com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.T$Q:
+    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1214:1220 -> <init>
+    8:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1217:1226 -> <init>
+    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1222:1222 -> <init>
+com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.T$S:
     com.android.tools.r8.graph.DexMethod lastIndexOfString -> o
     com.android.tools.r8.graph.DexMethod lastIndexOfInt -> n
     com.android.tools.r8.graph.DexMethod indexOfString -> m
@@ -20085,31 +20092,31 @@
     com.android.tools.r8.graph.DexMethod hashCode -> r
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> q
     com.android.tools.r8.graph.DexMethod compareTo -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1645:1645 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1677:1677 -> <init>
-    3:77:void <init>(com.android.tools.r8.graph.DexItemFactory):1647:1721 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1727:1727 -> a
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.T$R:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1671:1671 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1703:1703 -> <init>
+    3:77:void <init>(com.android.tools.r8.graph.DexItemFactory):1673:1747 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1753:1753 -> a
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.T$T:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1214:1214 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1221:1223 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1222:1225 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1224:1231 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1229:1229 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1229:1229 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1236:1238 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1237:1240 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1239:1246 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1244:1244 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.U:
     int $r8$clinit -> t
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():20:20 -> <clinit>
     1:28:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):41:68 -> <init>
     1:1:java.lang.String toSourceString():103:103 -> D
-    boolean isNotProgramClass() -> G0
-    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):76:78 -> a
-    4:4:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):93:93 -> a
-    5:10:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):148:153 -> a
-    1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):109:109 -> b
+    boolean isNotProgramClass() -> H0
+    1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):93:93 -> a
+    2:7:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):148:153 -> a
+    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):76:78 -> b
+    4:4:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):109:109 -> b
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):83:83 -> e
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> e
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):84 -> e
@@ -20195,7 +20202,7 @@
     17:19:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):155 -> a
     20:20:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):170:170 -> a
     20:20:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):156 -> a
-    21:21:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    21:21:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     21:21:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):170 -> a
     21:21:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):156 -> a
     22:22:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):175:175 -> a
@@ -20206,15 +20213,15 @@
     1:1:com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass):20:20 -> b
     2:2:com.android.tools.r8.graph.ProgramMethod lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):120:120 -> b
     3:3:boolean match(com.android.tools.r8.graph.DexMethod):221:221 -> b
-    1:1:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):529:529 -> c
+    1:1:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):533:533 -> c
     1:1:com.android.tools.r8.graph.DexClassAndMethod lookupMemberOnClass(com.android.tools.r8.graph.DexClass):115 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):533:533 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):529 -> c
+    2:2:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):537:537 -> c
+    2:2:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):533 -> c
     2:2:com.android.tools.r8.graph.DexClassAndMethod lookupMemberOnClass(com.android.tools.r8.graph.DexClass):115 -> c
-    1:1:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):523:523 -> d
+    1:1:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):527:527 -> d
     1:1:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):110 -> d
-    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> d
-    2:2:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):523 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):527 -> d
     2:2:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):110 -> d
     3:3:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):110:110 -> d
     1:1:com.android.tools.r8.graph.DexType getParameter(int):63:63 -> g
@@ -20283,7 +20290,7 @@
     75:75:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):268:268 -> a
     76:76:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):170:170 -> a
     76:76:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):268 -> a
-    77:77:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    77:77:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):170 -> a
     77:77:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):268 -> a
     78:78:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):271:271 -> a
@@ -20360,7 +20367,7 @@
     20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():175:175 -> i
     21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> i
     22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> i
-com.android.tools.r8.graph.DexMethodSignature -> com.android.tools.r8.internal.ya:
+com.android.tools.r8.graph.DexMethodSignature -> com.android.tools.r8.internal.za:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexProto proto -> a
     boolean $assertionsDisabled -> c
@@ -20370,7 +20377,7 @@
     2:2:com.android.tools.r8.graph.DexMethodSignature withName(com.android.tools.r8.graph.DexString):33:33 -> a
     3:3:com.android.tools.r8.graph.DexMethodSignature withProto(com.android.tools.r8.graph.DexProto):37:37 -> a
     4:4:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):41:41 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     5:5:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):41 -> a
     6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):45:45 -> a
     6:6:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):41 -> a
@@ -20390,25 +20397,24 @@
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):76:76 -> <init>
     2:49:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):50:97 -> <init>
     1:1:java.lang.String toSourceString():369:369 -> D
-    boolean isNotProgramClass() -> G0
-    1:1:java.lang.Iterable directProgramMethods():165:165 -> P0
-    1:1:long getChecksum():770:770 -> Q0
-    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():774:774 -> R0
-    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():696:696 -> S0
-    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():413:413 -> T0
-    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():295:295 -> U0
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():216:216 -> V0
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():220:220 -> W0
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):224:224 -> W0
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():220 -> W0
-    1:1:boolean hasClassFileVersion():692:692 -> X0
-    1:1:boolean hasClassOrMemberAnnotations():532:532 -> Y0
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):551:552 -> Y0
-    2:3:boolean hasClassOrMemberAnnotations():533 -> Y0
-    4:6:boolean hasClassOrMemberAnnotations():533:535 -> Y0
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):553:553 -> Y0
-    7:7:boolean hasClassOrMemberAnnotations():533 -> Y0
-    1:1:boolean hasFields():519:519 -> Z0
+    boolean isNotProgramClass() -> H0
+    1:1:java.lang.Iterable directProgramMethods():165:165 -> Q0
+    1:1:long getChecksum():766:766 -> R0
+    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():770:770 -> S0
+    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():692:692 -> T0
+    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():413:413 -> U0
+    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():295:295 -> V0
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():216:216 -> W0
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():220:220 -> X0
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):224:224 -> X0
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():220 -> X0
+    1:1:boolean hasClassFileVersion():688:688 -> Y0
+    1:1:boolean hasClassOrMemberAnnotations():532:532 -> Z0
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):551:552 -> Z0
+    2:3:boolean hasClassOrMemberAnnotations():533 -> Z0
+    4:6:boolean hasClassOrMemberAnnotations():533:535 -> Z0
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):553:553 -> Z0
+    7:7:boolean hasClassOrMemberAnnotations():533 -> Z0
     1:3:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):17:19 -> a
     1:3:void lambda$collectIndexedItems$22(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):329 -> a
     4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
@@ -20423,13 +20429,13 @@
     33:33:boolean lambda$forEachProgramInstanceInitializerMatching$17(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):202:202 -> a
     34:34:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$19(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):271:271 -> a
     35:35:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):271:271 -> a
-    36:41:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):310:315 -> a
+    36:41:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):314:319 -> a
     36:41:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):271 -> a
     42:42:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$20(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):276:276 -> a
     43:44:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):286:287 -> a
     45:47:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$21(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):289:291 -> a
     48:55:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):308:315 -> a
-    56:56:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    56:56:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     56:56:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):316 -> a
     57:58:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):318:319 -> a
     59:60:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):100:101 -> a
@@ -20448,14 +20454,10 @@
     96:98:boolean hasNonDefaultStaticFieldValues():581:583 -> a
     96:98:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):558 -> a
     99:114:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):561:576 -> a
-    115:115:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> a
-    116:117:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):687:688 -> a
-    118:118:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):728:728 -> a
-    119:119:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):766:766 -> a
-    1:1:boolean hasMethods():523:523 -> a1
-    1:1:boolean hasMethodsOrFields():527 -> a1
-    2:2:boolean hasFields():519:519 -> a1
-    2:2:boolean hasMethodsOrFields():527 -> a1
+    115:116:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):683:684 -> a
+    117:117:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):724:724 -> a
+    118:118:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):762:762 -> a
+    1:1:boolean hasFields():519:519 -> a1
     1:1:void lambda$forEachProgramField$10(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):142:142 -> b
     2:2:void lambda$forEachProgramDirectMethodMatching$16(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):192:192 -> b
     3:3:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):224:224 -> b
@@ -20473,19 +20475,17 @@
     26:28:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):120:122 -> b
     26:28:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):510 -> b
     29:29:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):591:591 -> b
-    30:32:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):681:683 -> b
-    33:35:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):716:718 -> b
-    36:36:java.util.Iterator lambda$asProgramClasses$26(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):729:729 -> b
-    37:37:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):761:761 -> b
+    30:32:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):677:679 -> b
+    33:35:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):712:714 -> b
+    36:36:java.util.Iterator lambda$asProgramClasses$26(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):725:725 -> b
+    37:37:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):757:757 -> b
     38:38:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
-    38:38:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):761 -> b
-    39:39:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):761:761 -> b
-    1:1:boolean hasOnlyInternalizableAnnotations():539:539 -> b1
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):551:552 -> b1
-    2:3:boolean hasOnlyInternalizableAnnotations():539 -> b1
-    4:6:boolean hasOnlyInternalizableAnnotations():539:541 -> b1
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):553:553 -> b1
-    7:7:boolean hasOnlyInternalizableAnnotations():539 -> b1
+    38:38:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):757 -> b
+    39:39:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):757:757 -> b
+    1:1:boolean hasMethods():523:523 -> b1
+    1:1:boolean hasMethodsOrFields():527 -> b1
+    2:2:boolean hasFields():519:519 -> b1
+    2:2:boolean hasMethodsOrFields():527 -> b1
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> c
     1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexProgramClass):124:124 -> c
     2:2:void lambda$forEachProgramMethodMatching$11(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):157:157 -> c
@@ -20494,20 +20494,25 @@
     5:27:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):473:495 -> c
     28:30:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):545:547 -> c
     31:31:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> c
-    32:32:boolean com.android.tools.r8.graph.DexClass.isFinal():601:601 -> c
+    32:32:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> c
     32:32:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):378 -> c
     33:39:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):381:387 -> c
-    40:40:void addExtraInterfaces(java.util.List):627:627 -> c
-    41:44:void addExtraInterfacesToInterfacesArray(java.util.List):635:638 -> c
-    41:44:void addExtraInterfaces(java.util.List):630 -> c
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():523:523 -> c
-    45:45:void addExtraInterfacesToInterfacesArray(java.util.List):638 -> c
-    45:45:void addExtraInterfaces(java.util.List):630 -> c
-    46:48:void addExtraInterfacesToInterfacesArray(java.util.List):638:640 -> c
-    46:48:void addExtraInterfaces(java.util.List):630 -> c
-    49:61:void addExtraInterfacesToSignatureIfPresent(java.util.List):645:657 -> c
-    49:61:void addExtraInterfaces(java.util.List):631 -> c
-    1:1:boolean isDeprecated():704:704 -> c1
+    40:40:void addExtraInterfaces(java.util.List):623:623 -> c
+    41:44:void addExtraInterfacesToInterfacesArray(java.util.List):631:634 -> c
+    41:44:void addExtraInterfaces(java.util.List):626 -> c
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():530:530 -> c
+    45:45:void addExtraInterfacesToInterfacesArray(java.util.List):634 -> c
+    45:45:void addExtraInterfaces(java.util.List):626 -> c
+    46:48:void addExtraInterfacesToInterfacesArray(java.util.List):634:636 -> c
+    46:48:void addExtraInterfaces(java.util.List):626 -> c
+    49:61:void addExtraInterfacesToSignatureIfPresent(java.util.List):641:653 -> c
+    49:61:void addExtraInterfaces(java.util.List):627 -> c
+    1:1:boolean hasOnlyInternalizableAnnotations():539:539 -> c1
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):551:552 -> c1
+    2:3:boolean hasOnlyInternalizableAnnotations():539 -> c1
+    4:6:boolean hasOnlyInternalizableAnnotations():539:541 -> c1
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):553:553 -> c1
+    7:7:boolean hasOnlyInternalizableAnnotations():539 -> c1
     1:1:com.android.tools.r8.graph.DexType lambda$specify$1(com.android.tools.r8.graph.DexProgramClass):125:125 -> d
     2:2:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$12(com.android.tools.r8.graph.DexEncodedMethod):165:165 -> d
     3:3:void forEachProgramInstanceInitializerMatching(java.util.function.Predicate,java.util.function.Consumer):201:201 -> d
@@ -20515,38 +20520,39 @@
     5:5:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):239:239 -> d
     6:6:com.android.tools.r8.graph.ProgramField toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):248:248 -> d
     6:6:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):239 -> d
-    7:7:void replaceInterfaces(java.util.List):608:608 -> d
-    8:14:void clearInterfaces():616:622 -> d
-    8:14:void replaceInterfaces(java.util.List):611 -> d
-    15:15:void replaceInterfaces(java.util.List):612:612 -> d
-    1:1:boolean originatesFromClassResource():303:303 -> d1
+    7:7:void replaceInterfaces(java.util.List):604:604 -> d
+    8:14:void clearInterfaces():612:618 -> d
+    8:14:void replaceInterfaces(java.util.List):607 -> d
+    15:15:void replaceInterfaces(java.util.List):608:608 -> d
+    1:1:boolean isDeprecated():700:700 -> d1
     1:1:com.android.tools.r8.graph.DexTypeList lambda$specify$2(com.android.tools.r8.graph.DexProgramClass):126:126 -> e
     2:2:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):156:156 -> e
     3:3:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$13(com.android.tools.r8.graph.DexEncodedMethod):169:169 -> e
-    1:1:boolean originatesFromDexResource():299:299 -> e1
+    1:1:boolean originatesFromClassResource():303:303 -> e1
     boolean isProgramClass() -> f
     1:1:com.android.tools.r8.graph.ClassAccessFlags lambda$specify$3(com.android.tools.r8.graph.DexProgramClass):127:127 -> f
     2:2:com.android.tools.r8.graph.ProgramMethod lambda$virtualProgramMethods$14(com.android.tools.r8.graph.DexEncodedMethod):173:173 -> f
     3:3:void forEachProgramDirectMethod(java.util.function.Consumer):186:186 -> f
     4:4:void forEachProgramVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):211:211 -> f
     5:5:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):243:243 -> f
-    1:1:java.lang.Iterable programInstanceInitializers():182:182 -> f1
+    1:1:boolean originatesFromDexResource():299:299 -> f1
     com.android.tools.r8.graph.DexDefinition getDefinition() -> g
     1:1:com.android.tools.r8.graph.DexString lambda$specify$4(com.android.tools.r8.graph.DexProgramClass):128:128 -> g
     2:2:void forEachProgramField(java.util.function.Consumer):142:142 -> g
     3:3:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):255:255 -> g
-    1:1:void setDeprecated():700:700 -> g1
+    1:1:java.lang.Iterable programInstanceInitializers():182:182 -> g1
     1:1:com.android.tools.r8.cf.CfVersion lambda$specify$5(com.android.tools.r8.graph.DexProgramClass):129:129 -> h
     2:2:void forEachProgramMethod(java.util.function.Consumer):151:151 -> h
-    1:1:java.lang.Iterable virtualProgramMethods():173:173 -> h1
+    1:1:void setDeprecated():696:696 -> h1
     1:1:boolean lambda$specify$6(com.android.tools.r8.graph.DexProgramClass):130:130 -> i
     2:2:void forEachProgramVirtualMethod(java.util.function.Consumer):206:206 -> i
+    1:1:java.lang.Iterable virtualProgramMethods():173:173 -> i1
     1:1:boolean lambda$specify$7(com.android.tools.r8.graph.DexProgramClass):135:135 -> j
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():120:120 -> k
     2:2:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$8(com.android.tools.r8.graph.DexProgramClass):136:136 -> k
     3:3:java.lang.Iterable directProgramMethods(java.util.function.Predicate):169:169 -> k
     1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$9(com.android.tools.r8.graph.DexProgramClass):137:137 -> l
-    1:1:com.android.tools.r8.graph.DexType getContextType():672:672 -> m
+    1:1:com.android.tools.r8.graph.DexType getContextType():668:668 -> m
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     com.android.tools.r8.graph.Definition getContext() -> r
     1:1:java.lang.String toString():364:364 -> toString
@@ -20555,11 +20561,11 @@
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
     com.android.tools.r8.graph.DexDefinitionSupplier val$definitions -> c
-    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):729:733 -> <init>
-    1:1:boolean hasNext():737:737 -> hasNext
-    1:5:com.android.tools.r8.graph.DexProgramClass findNext():748:752 -> k
-    1:2:com.android.tools.r8.graph.DexProgramClass next():742:743 -> next
-    1:2:java.lang.Object next():729 -> next
+    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):725:729 -> <init>
+    1:1:boolean hasNext():733:733 -> hasNext
+    1:5:com.android.tools.r8.graph.DexProgramClass findNext():744:748 -> k
+    1:2:com.android.tools.r8.graph.DexProgramClass next():738:739 -> next
+    1:2:java.lang.Object next():725 -> next
 com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.Z$b:
     long getChecksum(com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.a0:
@@ -20583,7 +20589,7 @@
     8:8:java.lang.Iterable getBaseTypes(com.android.tools.r8.graph.DexItemFactory):70 -> a
     9:9:java.lang.Iterable getBaseTypes(com.android.tools.r8.graph.DexItemFactory):70:70 -> a
     10:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):100:101 -> a
-    12:12:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    12:12:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     12:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):101 -> a
     13:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):102:103 -> a
     15:16:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):100:101 -> a
@@ -20627,66 +20633,66 @@
     1:3:void <clinit>():20:22 -> <clinit>
     1:3:void <init>(int,byte[]):28:30 -> <init>
     4:6:void <init>(java.lang.String):33:35 -> <init>
-    1:1:int computeHashCode():107:107 -> E
-    1:3:java.lang.String decode():137:139 -> F
-    1:32:int decodedHashCode():183:214 -> G
-    33:46:int decodedHashCode():197:210 -> G
-    1:11:java.lang.String dump():422:432 -> H
-    1:1:boolean isValidClassDescriptor():388:388 -> I
-    2:13:boolean isValidClassDescriptor(java.lang.String):306:317 -> I
-    2:13:boolean isValidClassDescriptor():388 -> I
-    14:14:boolean isValidClassDescriptor(java.lang.String):315:315 -> I
-    14:14:boolean isValidClassDescriptor():388 -> I
-    1:1:boolean isValidFieldName():380:380 -> J
-    2:18:boolean isValidFieldName(java.lang.String):347:363 -> J
-    2:18:boolean isValidFieldName():380 -> J
-    19:19:boolean isValidFieldName(java.lang.String):361:361 -> J
-    19:19:boolean isValidFieldName():380 -> J
-    1:1:boolean isValidMethodName():372:372 -> K
-    2:16:boolean isValidMethodName(java.lang.String):325:339 -> K
-    2:16:boolean isValidMethodName():372 -> K
-    17:17:boolean isValidMethodName(java.lang.String):337:337 -> K
-    17:17:boolean isValidMethodName():372 -> K
-    1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():66:66 -> L
-    1:3:java.lang.String toASCIIString():130:132 -> M
+    1:1:int computeHashCode():111:111 -> E
+    1:3:java.lang.String decode():141:143 -> F
+    1:32:int decodedHashCode():187:218 -> G
+    33:46:int decodedHashCode():201:214 -> G
+    1:11:java.lang.String dump():426:436 -> H
+    1:1:boolean isValidClassDescriptor():392:392 -> I
+    2:13:boolean isValidClassDescriptor(java.lang.String):310:321 -> I
+    2:13:boolean isValidClassDescriptor():392 -> I
+    14:14:boolean isValidClassDescriptor(java.lang.String):319:319 -> I
+    14:14:boolean isValidClassDescriptor():392 -> I
+    1:1:boolean isValidFieldName():384:384 -> J
+    2:18:boolean isValidFieldName(java.lang.String):351:367 -> J
+    2:18:boolean isValidFieldName():384 -> J
+    19:19:boolean isValidFieldName(java.lang.String):365:365 -> J
+    19:19:boolean isValidFieldName():384 -> J
+    1:1:boolean isValidMethodName():376:376 -> K
+    2:16:boolean isValidMethodName(java.lang.String):329:343 -> K
+    2:16:boolean isValidMethodName():376 -> K
+    17:17:boolean isValidMethodName(java.lang.String):341:341 -> K
+    17:17:boolean isValidMethodName():376 -> K
+    1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():70:70 -> L
+    1:3:java.lang.String toASCIIString():134:136 -> M
     int countBytes(char) -> a
     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):57:57 -> a
+    2:2:int acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> 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):62:62 -> a
-    5:21:int decodePrefix(char[]):146:162 -> a
-    22:34:int decodePrefix(char[]):160:172 -> a
-    35:42:int decodePrefix(char[]):170:177 -> a
-    43:45:int countBytes(java.lang.String):222:224 -> a
-    43:45:byte[] encodeToMutf8(java.lang.String):241 -> a
-    46:51:byte[] encodeToMutf8(java.lang.String):241:246 -> a
-    52:59:int encodeToMutf8(char,byte[],int):252:259 -> a
-    60:60:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):270:270 -> a
-    61:73:int internalCompareTo(com.android.tools.r8.graph.DexString):282:294 -> a
-    61:73:int compareTo(com.android.tools.r8.graph.DexString):52 -> a
-    74:81:boolean isValidSimpleName(int,java.lang.String):396:403 -> a
-    82:82:int getArrayDim():513:513 -> a
-    82:82: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):480 -> a
-    83:100: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):481:498 -> a
-    101:104:com.android.tools.r8.graph.DexString toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):520:523 -> a
-    1:5:boolean endsWith(com.android.tools.r8.graph.DexString):464:468 -> b
-    1:5:boolean startsWith(com.android.tools.r8.graph.DexString):436:440 -> c
+    4:4:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):66:66 -> a
+    5:21:int decodePrefix(char[]):150:166 -> a
+    22:34:int decodePrefix(char[]):164:176 -> a
+    35:42:int decodePrefix(char[]):174:181 -> a
+    43:45:int countBytes(java.lang.String):226:228 -> a
+    43:45:byte[] encodeToMutf8(java.lang.String):245 -> a
+    46:51:byte[] encodeToMutf8(java.lang.String):245:250 -> a
+    52:59:int encodeToMutf8(char,byte[],int):256:263 -> a
+    60:60:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):274:274 -> a
+    61:73:int internalCompareTo(com.android.tools.r8.graph.DexString):286:298 -> a
+    61:73:int compareTo(com.android.tools.r8.graph.DexString):56 -> a
+    74:81:boolean isValidSimpleName(int,java.lang.String):400:407 -> a
+    82:82:int getArrayDim():517:517 -> a
+    82:82: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):484 -> a
+    83:100: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):485:502 -> a
+    101:104:com.android.tools.r8.graph.DexString toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):524:527 -> a
+    1:5:boolean endsWith(com.android.tools.r8.graph.DexString):468:472 -> b
+    1:5:boolean startsWith(com.android.tools.r8.graph.DexString):440:444 -> c
     1:1:int compareTo(java.lang.Object):20:20 -> compareTo
-    1:3:boolean computeEquals(java.lang.Object):112:114 -> g
-    4:6:boolean isValidSimpleName(int):411:413 -> g
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():46:46 -> k
+    1:3:boolean computeEquals(java.lang.Object):116:118 -> g
+    4:6:boolean isValidSimpleName(int):415:417 -> g
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():50:50 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
-    1:3:java.lang.String toString():122:124 -> toString
+    1:3:java.lang.String toString():126:128 -> toString
 com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.c0$a:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
-    1:1:void <clinit>():66:66 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexString):66:68 -> <init>
-    1:24:char nextChar():72:95 -> a
-    25:25:char nextChar():73:73 -> a
-    1:1:boolean hasNext():100:100 -> hasNext
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexString):70:72 -> <init>
+    1:24:char nextChar():76:99 -> a
+    25:25:char nextChar():77:77 -> a
+    1:1:boolean hasNext():104:104 -> hasNext
 com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.d0:
     java.lang.String toStringCache -> g
     boolean $assertionsDisabled -> j
@@ -20729,7 +20735,7 @@
     25:25:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):173:173 -> a
     26:26:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):182:182 -> a
     27:28:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):219:220 -> a
-    29:29:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    29:29:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     29:29:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):220 -> a
     30:30:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):232:232 -> a
     31:33:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):410:412 -> a
@@ -21253,16 +21259,16 @@
     com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> W
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1242:1242 -> Z
     1:1:void collectIndexedItems(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):265:265 -> a
+    2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     2:2:void collectIndexedItems(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
     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):62:62 -> b
+    2:2:void com.android.tools.r8.graph.DexString.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):66:66 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1208 -> b
     3:7:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1213:1217 -> b
-    8:8:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> b
+    8:8:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> b
     8:8:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1217 -> b
     boolean isDexValueString() -> j0
     boolean isNestedDexValue() -> l0
@@ -21394,7 +21400,7 @@
     1:7:void commitPendingClasspathClasses():263:269 -> g
     1:7:java.util.List getClasspathClasses():274 -> g
     8:8:java.util.List getClasspathClasses():275:275 -> g
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.ob:
     int $r8$clinit -> d
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
@@ -21405,11 +21411,12 @@
     1:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):40:44 -> a
     6:11:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):41:46 -> a
     12:12:com.android.tools.r8.graph.DexType getEnclosingClass():55:55 -> a
-    13:17:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):72:76 -> a
+    13:17:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):76:80 -> a
     1:1:com.android.tools.r8.graph.DexMethod getEnclosingMethod():51:51 -> b
-    1:1:boolean equals(java.lang.Object):66:66 -> equals
-    1:2:int hashCode():60:61 -> hashCode
-    1:4:java.lang.String toString():82:85 -> toString
+    1:1:com.android.tools.r8.graph.DexType getEnclosingType():59:59 -> c
+    1:1:boolean equals(java.lang.Object):70:70 -> equals
+    1:2:int hashCode():64:65 -> hashCode
+    1:4:java.lang.String toString():86:89 -> toString
 com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.h0:
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -21448,9 +21455,9 @@
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():0 -> d
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():360:360 -> e
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> e
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.lc:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.mc:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.oc:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -21479,7 +21486,7 @@
     2:2:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):15 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):50:50 -> c
     2:2:boolean verifyMappingIsOneToOne():95:95 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.oc:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.pc:
     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
@@ -21603,7 +21610,7 @@
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> e
     boolean isFailedOrUnknownResolution() -> l
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():151:151 -> n
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.Pc:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.Qc:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:1:com.android.tools.r8.graph.InitClassLens$Builder com.android.tools.r8.graph.InitClassLens.builder():13:13 -> a
@@ -21617,139 +21624,142 @@
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature NO_FIELD_TYPE_SIGNATURE -> e
     java.util.List EMPTY_TYPE_SIGNATURES -> d
     java.util.List EMPTY_SUPER_INTERFACES -> c
-    1:380:void <clinit>():101:480 -> <clinit>
+    1:385:void <clinit>():101:485 -> <clinit>
     1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature access$000():99:99 -> a
-    2:10:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):861:869 -> a
-    11:13:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):868:870 -> a
-    14:14:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):862:862 -> a
-    1:9:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):880:888 -> b
-    10:12:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):887:889 -> b
-    13:13:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):881:881 -> b
-    1:9:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):899:907 -> c
-    10:12:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):906:908 -> c
-    13:13:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):900:900 -> c
+    2:10:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):869:877 -> a
+    11:13:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):876:878 -> a
+    14:14:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):870:870 -> a
+    1:9:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):888:896 -> b
+    10:12:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):895:897 -> b
+    13:13:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):889:889 -> b
+    1:9:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):907:915 -> c
+    10:12:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):914:916 -> c
+    13:13:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodSignature(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.DiagnosticsHandler):908:908 -> c
 com.android.tools.r8.graph.GenericSignature$1 -> com.android.tools.r8.graph.j0$a:
 com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.j0$b:
     com.android.tools.r8.graph.GenericSignature$TypeSignature elementSignature -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():580:580 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):585:585 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignature$WildcardIndicator):589:591 -> <init>
-    1:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):610:611 -> a
-    3:10:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):620:627 -> a
-    1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():616:616 -> h
-    2:2:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):585:585 -> h
-    2:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():616 -> h
-    com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> i
-    boolean isArrayTypeSignature() -> n
+    1:1:void <clinit>():588:588 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):593:593 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature,com.android.tools.r8.graph.GenericSignature$WildcardIndicator):597:599 -> <init>
+    1:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):618:619 -> a
+    3:10:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):628:635 -> a
+    1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():624:624 -> i
+    2:2:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):593:593 -> i
+    2:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():624 -> i
+    com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> j
+    boolean isArrayTypeSignature() -> o
 com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.j0$c:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():672:672 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexType):675:678 -> <init>
-    com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> e
-    1:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():693:694 -> h
+    1:1:void <clinit>():680:680 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexType):683:686 -> <init>
+    com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> f
+    1:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():701:702 -> i
 com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.j0$d:
     java.util.List formalTypeParameters -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature -> b
     java.util.List superInterfaceSignatures -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GenericSignature$ClassSignature NO_CLASS_SIGNATURE -> d
-    1:4:void <clinit>():182:185 -> <clinit>
-    1:7:void <init>(java.util.List,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):194:200 -> <init>
-    1:11:com.android.tools.r8.graph.GenericSignature$ClassSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):237:247 -> a
-    12:18:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):251:257 -> a
-    1:1:boolean hasSignature():213:213 -> c
-    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():182:182 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$200():182:182 -> e
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature noSignature():266:266 -> f
-    1:1:java.util.List superInterfaceSignatures():208:208 -> g
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidClassSignature toInvalid():219:219 -> h
-    1:1:java.lang.String toString():262:262 -> toString
+    1:4:void <clinit>():187:190 -> <clinit>
+    1:7:void <init>(java.util.List,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):199:205 -> <init>
+    1:11:com.android.tools.r8.graph.GenericSignature$ClassSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):242:252 -> a
+    12:18:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):256:262 -> a
+    1:1:boolean hasSignature():218:218 -> d
+    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():187:187 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$200():187:187 -> f
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature noSignature():271:271 -> g
+    1:1:java.util.List superInterfaceSignatures():213:213 -> h
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidClassSignature toInvalid():224:224 -> i
+    1:1:java.lang.String toString():267:267 -> toString
 com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.j0$e:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature enclosingTypeSignature -> d
     java.util.List typeArguments -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType type -> b
-    1:1:void <clinit>():483:483 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):494:494 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexType,java.util.List):498:498 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):505:505 -> <init>
-    4:10:void <init>(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$WildcardIndicator):513:519 -> <init>
-    1:2:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):542:543 -> a
-    1:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):483 -> a
-    3:18:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):552:567 -> a
-    1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():548:548 -> h
-    com.android.tools.r8.graph.GenericSignature$ClassTypeSignature asClassTypeSignature() -> j
-    boolean isClassTypeSignature() -> o
-    1:1:com.android.tools.r8.graph.DexType type():523:523 -> t
-    1:1:java.util.List typeArguments():527:527 -> u
+    1:1:void <clinit>():488:488 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType):499:499 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexType,java.util.List):503:503 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):510:510 -> <init>
+    4:12:void <init>(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$WildcardIndicator):518:526 -> <init>
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):488:488 -> a
+    2:17:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):560:575 -> a
+    1:3:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):549:551 -> b
+    1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():556:556 -> i
+    com.android.tools.r8.graph.GenericSignature$ClassTypeSignature asClassTypeSignature() -> k
+    boolean isClassTypeSignature() -> p
+    1:1:com.android.tools.r8.graph.DexType type():530:530 -> u
+    1:1:java.util.List typeArguments():534:534 -> v
 com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.j0$f:
-    1:1:boolean hasNoSignature():135:135 -> a
-    boolean isInvalid() -> b
-    boolean hasSignature() -> c
-    com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid() -> d
+    1:1:boolean isValid():143:143 -> a
+    1:1:boolean hasNoSignature():135:135 -> b
+    boolean isInvalid() -> c
+    boolean hasSignature() -> d
+    com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid() -> e
 com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.j0$g:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator wildcardIndicator -> a
-    1:1:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator,com.android.tools.r8.graph.GenericSignature$1):337:337 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):342:343 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator,com.android.tools.r8.graph.GenericSignature$1):342:342 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):347:348 -> <init>
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator) -> a
-    1:7:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):400:406 -> a
-    1:1:boolean hasSignature():390:390 -> c
-    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():337:337 -> d
-    com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> f
-    boolean isFieldTypeSignature() -> g
-    com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> i
-    com.android.tools.r8.graph.GenericSignature$ClassTypeSignature asClassTypeSignature() -> j
-    com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> k
-    1:1:com.android.tools.r8.graph.GenericSignature$WildcardIndicator getWildcardIndicator():351:351 -> l
-    1:1:boolean isArgument():347:347 -> m
-    boolean isArrayTypeSignature() -> n
-    boolean isClassTypeSignature() -> o
-    boolean isStar() -> p
-    boolean isTypeVariableSignature() -> q
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature noSignature():415:415 -> r
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidFieldTypeSignature toInvalid():420:420 -> s
-    1:1:java.lang.String toString():411:411 -> toString
+    1:7:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):405:411 -> a
+    1:1:boolean hasSignature():395:395 -> d
+    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():342:342 -> e
+    com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> g
+    boolean isFieldTypeSignature() -> h
+    com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> j
+    com.android.tools.r8.graph.GenericSignature$ClassTypeSignature asClassTypeSignature() -> k
+    com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> l
+    1:1:com.android.tools.r8.graph.GenericSignature$WildcardIndicator getWildcardIndicator():356:356 -> m
+    1:1:boolean isArgument():352:352 -> n
+    boolean isArrayTypeSignature() -> o
+    boolean isClassTypeSignature() -> p
+    boolean isStar() -> q
+    boolean isTypeVariableSignature() -> r
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature noSignature():420:420 -> s
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidFieldTypeSignature toInvalid():425:425 -> t
+    1:1:java.lang.String toString():416:416 -> toString
 com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.j0$h:
     java.util.List interfaceBounds -> c
     java.lang.String name -> a
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature classBound -> b
-    1:4:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,java.util.List):152:155 -> <init>
-    1:7:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visit(com.android.tools.r8.graph.GenericSignatureVisitor):172:178 -> a
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():149:149 -> <clinit>
+    1:5:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,java.util.List):156:160 -> <init>
+    1:7:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visit(com.android.tools.r8.graph.GenericSignatureVisitor):177:183 -> a
 com.android.tools.r8.graph.GenericSignature$InvalidClassSignature -> com.android.tools.r8.graph.j0$i:
     java.lang.String genericSignatureString -> f
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():270:270 -> <clinit>
-    1:2:void <init>(java.lang.String):275:276 -> <init>
-    1:1:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):281:281 -> a
-    2:2:com.android.tools.r8.graph.GenericSignature$ClassSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):297:297 -> a
-    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():270:270 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidClassSignature toInvalid():291:291 -> h
-    1:1:java.lang.String toString():286:286 -> toString
+    1:1:void <clinit>():275:275 -> <clinit>
+    1:2:void <init>(java.lang.String):280:281 -> <init>
+    1:1:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):286:286 -> a
+    2:2:com.android.tools.r8.graph.GenericSignature$ClassSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):302:302 -> a
+    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():275:275 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidClassSignature toInvalid():296:296 -> i
+    1:1:java.lang.String toString():291:291 -> toString
 com.android.tools.r8.graph.GenericSignature$InvalidFieldTypeSignature -> com.android.tools.r8.graph.j0$j:
     java.lang.String genericSignature -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():424:424 -> <clinit>
-    1:2:void <init>(java.lang.String):429:430 -> <init>
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):435:435 -> a
-    2:2:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):446:446 -> a
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidFieldTypeSignature toInvalid():451:451 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():424 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidFieldTypeSignature toInvalid():451:451 -> s
-    1:1:java.lang.String toString():441:441 -> toString
+    1:1:void <clinit>():429:429 -> <clinit>
+    1:2:void <init>(java.lang.String):434:435 -> <init>
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):440:440 -> a
+    2:2:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):451:451 -> a
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidFieldTypeSignature toInvalid():456:456 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():429 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidFieldTypeSignature toInvalid():456:456 -> t
+    1:1:java.lang.String toString():446:446 -> toString
 com.android.tools.r8.graph.GenericSignature$InvalidMethodTypeSignature -> com.android.tools.r8.graph.j0$k:
     java.lang.String genericSignature -> g
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():818:818 -> <clinit>
-    1:2:void <init>(java.lang.String):823:824 -> <init>
-    1:1:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):829:829 -> a
-    2:2:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):844:844 -> a
-    boolean isInvalid() -> b
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidMethodTypeSignature toInvalid():850:850 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():818 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidMethodTypeSignature toInvalid():850:850 -> h
-    1:1:java.lang.String toString():834:834 -> toString
+    1:1:void <clinit>():826:826 -> <clinit>
+    1:2:void <init>(java.lang.String):831:832 -> <init>
+    1:1:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):837:837 -> a
+    2:2:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):852:852 -> a
+    boolean isInvalid() -> c
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidMethodTypeSignature toInvalid():858:858 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():826 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidMethodTypeSignature toInvalid():858:858 -> i
+    1:1:java.lang.String toString():842:842 -> toString
 com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.j0$l:
     java.util.List typeSignatures -> b
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature NO_METHOD_TYPE_SIGNATURE -> e
@@ -21757,18 +21767,18 @@
     com.android.tools.r8.graph.GenericSignature$ReturnType returnType -> c
     java.util.List throwsSignatures -> d
     boolean $assertionsDisabled -> f
-    1:3:void <clinit>():717:719 -> <clinit>
-    1:9:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.GenericSignature$ReturnType,java.util.List):736:744 -> <init>
-    1:4:com.android.tools.r8.graph.GenericSignature$TypeSignature getParameterTypeSignature(int):748:751 -> a
-    5:16:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):778:789 -> a
-    17:23:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):798:804 -> a
-    1:1:boolean hasSignature():769:769 -> c
-    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():717:717 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature access$400():717:717 -> e
-    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature noSignature():729:729 -> f
-    1:1:com.android.tools.r8.graph.GenericSignature$ReturnType returnType():755:755 -> g
-    1:1:com.android.tools.r8.graph.GenericSignature$InvalidMethodTypeSignature toInvalid():814:814 -> h
-    1:1:java.lang.String toString():809:809 -> toString
+    1:3:void <clinit>():725:727 -> <clinit>
+    1:9:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.GenericSignature$ReturnType,java.util.List):744:752 -> <init>
+    1:4:com.android.tools.r8.graph.GenericSignature$TypeSignature getParameterTypeSignature(int):756:759 -> a
+    5:16:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature visit(com.android.tools.r8.graph.GenericSignatureVisitor):786:797 -> a
+    17:23:java.lang.String toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):806:812 -> a
+    1:1:boolean hasSignature():777:777 -> d
+    1:1:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toInvalid():725:725 -> e
+    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature access$400():725:725 -> f
+    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature noSignature():737:737 -> g
+    1:1:com.android.tools.r8.graph.GenericSignature$ReturnType returnType():763:763 -> h
+    1:1:com.android.tools.r8.graph.GenericSignature$InvalidMethodTypeSignature toInvalid():822:822 -> i
+    1:1:java.lang.String toString():817:817 -> toString
 com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.j0$m:
     char[] buffer -> d
     com.android.tools.r8.graph.DexItemFactory factory -> f
@@ -21777,92 +21787,92 @@
     int pos -> e
     java.lang.String identifier -> b
     boolean eof -> c
-    1:1:void <clinit>():912:912 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GenericSignature$1):912:912 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexItemFactory):932:933 -> <init>
-    1:9:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String):938:946 -> a
-    10:10:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String):941:941 -> a
-    11:22:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature():1019:1030 -> a
-    23:29:void expect(char):1269:1275 -> a
-    30:30:void expect(char):1270:1270 -> a
-    31:34:void parseError(java.lang.String,int):1333:1336 -> a
-    1:9:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String):966:974 -> b
-    10:10:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String):969:969 -> b
-    11:24:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1100:1113 -> b
-    25:26:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):994:995 -> b
-    25:26:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1113 -> b
-    27:38:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1115:1126 -> b
-    39:43:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):1003:1007 -> b
-    39:43:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1126 -> b
-    44:44:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):1006:1006 -> b
-    44:44:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1126 -> b
-    45:45:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):1005:1005 -> b
-    45:45:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1126 -> b
-    46:55:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1127:1136 -> b
-    1:9:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature(java.lang.String):952:960 -> c
-    10:10:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature(java.lang.String):955:955 -> c
-    11:22:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature():1081:1092 -> c
-    23:23:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature():1090:1090 -> c
-    24:24:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature():1083:1083 -> c
-    1:6:void setInput(java.lang.String):979:984 -> d
-    7:16:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature():1206:1215 -> d
-    17:21:com.android.tools.r8.graph.GenericSignature$ReturnType updateReturnType():1241:1245 -> d
-    17:21:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature():1217 -> d
-    22:39:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature():1219:1236 -> d
-    1:7:java.util.List parseOptFormalTypeParameters():1035:1041 -> e
-    8:34:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter updateFormalTypeParameter():1050:1076 -> e
-    8:34:java.util.List parseOptFormalTypeParameters():1042 -> e
-    35:38:java.util.List parseOptFormalTypeParameters():1042:1045 -> e
-    1:22:void scanIdentifier():1295:1316 -> f
-    23:34:void scanIdentifier():1309:1320 -> f
-    35:35:void parseError():1329:1329 -> f
-    35:35:void scanIdentifier():1321 -> f
-    36:36:void scanIdentifier():1324:1324 -> f
-    1:11:void scanSymbol():1254:1264 -> g
-    1:13:java.util.List updateOptTypeArguments():1141:1153 -> h
-    1:11:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature updateTypeArgument():1158:1168 -> i
-    1:16:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1184:1199 -> j
-    17:19:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1193:1195 -> j
-    1:7:com.android.tools.r8.graph.GenericSignature$TypeVariableSignature updateTypeVariableSignature():1174:1180 -> k
+    1:1:void <clinit>():920:920 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GenericSignature$1):920:920 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexItemFactory):940:941 -> <init>
+    1:9:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String):946:954 -> a
+    10:10:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String):949:949 -> a
+    11:22:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature():1027:1038 -> a
+    23:29:void expect(char):1277:1283 -> a
+    30:30:void expect(char):1278:1278 -> a
+    31:34:void parseError(java.lang.String,int):1341:1344 -> a
+    1:9:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String):974:982 -> b
+    10:10:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature(java.lang.String):977:977 -> b
+    11:24:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1108:1121 -> b
+    25:26:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):1002:1003 -> b
+    25:26:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1121 -> b
+    27:38:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1123:1134 -> b
+    39:43:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):1011:1015 -> b
+    39:43:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1134 -> b
+    44:44:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):1014:1014 -> b
+    44:44:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1134 -> b
+    45:45:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):1013:1013 -> b
+    45:45:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1134 -> b
+    46:55:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature parseClassTypeSignature():1135:1144 -> b
+    1:9:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature(java.lang.String):960:968 -> c
+    10:10:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature(java.lang.String):963:963 -> c
+    11:22:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature():1089:1100 -> c
+    23:23:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature():1098:1098 -> c
+    24:24:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature parseFieldTypeSignature():1091:1091 -> c
+    1:6:void setInput(java.lang.String):987:992 -> d
+    7:16:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature():1214:1223 -> d
+    17:21:com.android.tools.r8.graph.GenericSignature$ReturnType updateReturnType():1249:1253 -> d
+    17:21:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature():1225 -> d
+    22:39:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature parseMethodTypeSignature():1227:1244 -> d
+    1:7:java.util.List parseOptFormalTypeParameters():1043:1049 -> e
+    8:34:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter updateFormalTypeParameter():1058:1084 -> e
+    8:34:java.util.List parseOptFormalTypeParameters():1050 -> e
+    35:38:java.util.List parseOptFormalTypeParameters():1050:1053 -> e
+    1:22:void scanIdentifier():1303:1324 -> f
+    23:34:void scanIdentifier():1317:1328 -> f
+    35:35:void parseError():1337:1337 -> f
+    35:35:void scanIdentifier():1329 -> f
+    36:36:void scanIdentifier():1332:1332 -> f
+    1:11:void scanSymbol():1262:1272 -> g
+    1:13:java.util.List updateOptTypeArguments():1149:1161 -> h
+    1:11:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature updateTypeArgument():1166:1176 -> i
+    1:16:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1192:1207 -> j
+    17:19:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1201:1203 -> j
+    1:7:com.android.tools.r8.graph.GenericSignature$TypeVariableSignature updateTypeVariableSignature():1182:1188 -> k
 com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.j0$n:
     com.android.tools.r8.graph.GenericSignature$ReturnType VOID -> b
     com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature -> a
-    1:1:void <clinit>():699:699 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):704:705 -> <init>
-    1:1:boolean isVoidDescriptor():709:709 -> a
-    1:1:com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature():713:713 -> b
+    1:1:void <clinit>():707:707 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):712:713 -> <init>
+    1:1:boolean isVoidDescriptor():717:717 -> a
+    1:1:com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature():721:721 -> b
 com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.j0$o:
     com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature STAR_FIELD_TYPE_SIGNATURE -> b
-    1:1:void <clinit>():458:458 -> <clinit>
-    1:1:void <init>():462:462 -> <init>
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):467:467 -> a
-    boolean isStar() -> p
-    1:1:com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature access$500():456:456 -> t
-    1:1:com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature getStarFieldTypeSignature():476:476 -> u
+    1:1:void <clinit>():463:463 -> <clinit>
+    1:1:void <init>():467:467 -> <init>
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):472:472 -> a
+    boolean isStar() -> q
+    1:1:com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature access$500():461:461 -> u
+    1:1:com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature getStarFieldTypeSignature():481:481 -> v
 com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.j0$p:
-    1:1:void <init>():307:307 -> <init>
-    com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> e
-    com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> f
-    boolean isFieldTypeSignature() -> g
-    com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature() -> h
+    1:1:void <init>():312:312 -> <init>
+    com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> f
+    com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> g
+    boolean isFieldTypeSignature() -> h
+    com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature() -> i
 com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.j0$q:
     java.lang.String typeVariable -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():631:631 -> <clinit>
-    1:1:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$1):631:631 -> <init>
-    2:2:void <init>(java.lang.String):636:636 -> <init>
-    3:5:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$WildcardIndicator):640:642 -> <init>
-    1:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):657:658 -> a
-    1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():663:663 -> h
-    com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> k
-    boolean isTypeVariableSignature() -> q
+    1:1:void <clinit>():639:639 -> <clinit>
+    1:1:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$1):639:639 -> <init>
+    2:2:void <init>(java.lang.String):644:644 -> <init>
+    3:5:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$WildcardIndicator):648:650 -> <init>
+    1:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):665:666 -> a
+    1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():671:671 -> i
+    com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> l
+    boolean isTypeVariableSignature() -> r
 com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.j0$r:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NEGATIVE -> c
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NONE -> b
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NOT_AN_ARGUMENT -> a
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator POSITIVE -> d
-    1:4:void <clinit>():331:334 -> <clinit>
-    1:1:void <init>(java.lang.String,int):330:330 -> <init>
+    1:4:void <clinit>():336:339 -> <clinit>
+    1:1:void <init>(java.lang.String,int):335:335 -> <init>
 com.android.tools.r8.graph.GenericSignatureCorrectnessHelper -> com.android.tools.r8.graph.k0:
     com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode mode -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -21878,7 +21888,7 @@
     11:11:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.markAsInvalid():39:39 -> a
     11:11:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):86 -> a
     12:12:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):87:87 -> a
-    13:13:void com.android.tools.r8.graph.DexClass.setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):997:997 -> a
+    13:13:void com.android.tools.r8.graph.DexClass.setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):1001:1001 -> a
     13:13:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):87 -> a
     14:30:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):90:106 -> a
     31:31:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$0(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):94:94 -> a
@@ -21905,27 +21915,27 @@
     6:18:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):240:252 -> a
     6:18:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List):231 -> a
     19:23:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateFormalTypeParameters(java.util.List):232:236 -> a
-    24:24:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():233:233 -> a
+    24:24:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():238:238 -> a
     24:24:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):146 -> a
     25:35:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):146:156 -> a
-    36:36:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():204:204 -> a
+    36:36:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():209:209 -> a
     36:36:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):157 -> a
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():523:523 -> a
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():530:530 -> a
     37:37:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):157 -> a
     38:39:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):157:158 -> a
-    40:40:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():204:204 -> a
+    40:40:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():209:209 -> a
     40:40:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):159 -> a
     41:43:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):159:161 -> a
-    44:44:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():204:204 -> a
+    44:44:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature com.android.tools.r8.graph.GenericSignature$ClassSignature.superClassSignature():209:209 -> a
     44:44:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):165 -> a
-    45:45:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():527:527 -> a
+    45:45:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():534:534 -> a
     45:45:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):165 -> a
     46:46:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):165:165 -> a
     47:49:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):164:166 -> a
-    50:50:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():208:208 -> a
+    50:50:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():213:213 -> a
     50:50:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):169 -> a
     51:59:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):170:178 -> a
-    60:60:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():527:527 -> a
+    60:60:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():534:534 -> a
     60:60:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):178 -> a
     61:61:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):178:178 -> a
     62:68:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):177:183 -> a
@@ -21933,28 +21943,28 @@
     70:70:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
     70:70:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):256 -> a
     71:79:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):257:265 -> a
-    80:80:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():667:667 -> a
+    80:80:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():675:675 -> a
     80:80:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):265 -> a
     81:86:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):266:271 -> a
     87:93:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):268:274 -> a
-    94:94:com.android.tools.r8.graph.GenericSignature$TypeSignature com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature.elementSignature():595:595 -> a
+    94:94:com.android.tools.r8.graph.GenericSignature$TypeSignature com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature.elementSignature():603:603 -> a
     94:94:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):274 -> a
     95:98:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):274:277 -> a
     99:99:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):281:281 -> a
     99:99:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):277 -> a
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():523:523 -> a
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():530:530 -> a
     100:100:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):282 -> a
     100:100:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):277 -> a
     101:101:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):281:281 -> a
     101:101:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgument(com.android.tools.r8.graph.GenericSignature$TypeSignature):277 -> a
     102:114:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType):287:299 -> a
-    115:115:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():233:233 -> a
+    115:115:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():238:238 -> a
     115:115:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType):299 -> a
     116:120:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType):299:303 -> a
-    121:121:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():794:794 -> a
+    121:121:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():802:802 -> a
     121:121:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):188 -> a
     122:123:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):188:189 -> a
-    124:124:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():794:794 -> a
+    124:124:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():802:802 -> a
     124:124:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):191 -> a
     125:144:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):191:210 -> a
     1:1:void lambda$visitMethodSignature$1(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):189:189 -> b
@@ -21988,44 +21998,80 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.o0:
+com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.m0:
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> a
-    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier):23:24 -> <init>
-    1:2:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):29:30 -> a
-    3:6:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$GenericSignatureTypeVisitor.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):58:61 -> a
-    3:6:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):30 -> a
-    7:8:void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition):35:36 -> a
-    9:10:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):41:42 -> a
-    11:14:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$GenericSignatureTypeVisitor.visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):66:69 -> a
-    11:14:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):42 -> a
-com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$1 -> com.android.tools.r8.graph.m0:
-com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$GenericSignatureTypeVisitor -> com.android.tools.r8.graph.n0:
-    com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> b
-    com.android.tools.r8.graph.ProgramDefinition context -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier,com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis$1):45:45 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier):51:53 -> <init>
-    1:1:void lambda$visitFormalTypeParameters$0(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):94:94 -> a
-    2:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):100:100 -> a
-    3:3:java.util.List visitInterfaceBounds(java.util.List):108:108 -> a
-    4:4:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):139:139 -> a
-    5:5:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
-    5:5:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):139 -> a
-    6:7:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):142:143 -> a
-    8:8:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):148:148 -> a
-    9:12:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):153:156 -> a
-    13:13:com.android.tools.r8.graph.DexType visitType(com.android.tools.r8.graph.DexType):185:185 -> a
-    1:15:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):74:88 -> b
-    16:16:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):119:119 -> b
-    17:17:java.util.List visitThrowsSignatures(java.util.List):168:168 -> b
-    1:1:java.util.List visitFormalTypeParameters(java.util.List):94:94 -> c
-    2:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitInterfaceBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):114:114 -> c
-    3:3:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):134:134 -> c
-    1:1:java.util.List visitTypeArguments(java.util.List):174:174 -> d
-    1:1:java.util.List visitMethodTypeSignatures(java.util.List):162:162 -> e
-    1:1:java.util.List visitSuperInterfaces(java.util.List):128:128 -> f
-com.android.tools.r8.graph.GenericSignaturePrinter -> com.android.tools.r8.graph.p0:
+    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier):15:16 -> <init>
+    1:2:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):21:22 -> a
+    3:6:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeVisitor.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):30:33 -> a
+    3:6:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):22 -> a
+    7:8:void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition):27:28 -> a
+    9:10:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):33:34 -> a
+    11:14:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature com.android.tools.r8.graph.GenericSignatureTypeVisitor.visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):38:41 -> a
+    11:14:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):34 -> a
+com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier -> com.android.tools.r8.graph.n0:
+    java.util.Map substitutions -> a
+    java.util.Set introducedClassTypeVariables -> c
+    java.util.Set introducedMethodTypeVariables -> d
+    boolean canUseWildcardInArguments -> e
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexType objectType -> b
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexType):34:34 -> <init>
+    2:12:void <init>(java.util.Map,com.android.tools.r8.graph.DexType):26:36 -> <init>
+    com.android.tools.r8.graph.DexType visitType(com.android.tools.r8.graph.DexType) -> a
+    1:4:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignature$ClassSignature,java.util.Map):41:44 -> a
+    5:5:void lambda$build$0(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):45:45 -> a
+    6:10:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):56:60 -> a
+    11:11:void lambda$visitMethodSignature$1(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):58:58 -> a
+    12:12:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):71:71 -> a
+    13:13:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
+    13:13:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):71 -> a
+    14:14:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):74:74 -> a
+    15:18:java.util.List visitInterfaceBounds(java.util.List):88:91 -> a
+    19:19:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> a
+    19:19:java.util.List visitInterfaceBounds(java.util.List):91 -> a
+    20:20:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):122:122 -> a
+    21:21:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):132:132 -> a
+    22:25:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):145:148 -> a
+    26:26:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):71:71 -> a
+    26:26:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):149 -> a
+    27:27:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
+    27:27:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):71 -> a
+    27:27:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):149 -> a
+    28:28:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):74:74 -> a
+    28:28:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):149 -> a
+    29:29:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):153:153 -> a
+    1:3:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):79:81 -> b
+    4:4:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():168:168 -> b
+    4:4:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):81 -> b
+    5:5:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):81:81 -> b
+    6:6:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():172:172 -> b
+    6:6:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):82 -> b
+    7:7:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):82:82 -> b
+    8:8:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):81:81 -> b
+    9:12:java.util.List visitThrowsSignatures(java.util.List):137:140 -> b
+    13:13:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> b
+    13:13:java.util.List visitThrowsSignatures(java.util.List):140 -> b
+    14:16:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):175:177 -> b
+    17:25:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):183:191 -> b
+    26:26:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():675:675 -> b
+    26:26:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):191 -> b
+    27:36:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):192:201 -> b
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):117:117 -> c
+    2:5:java.util.List visitFormalTypeParameters(java.util.List):159:162 -> c
+    6:6:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> c
+    6:6:java.util.List visitFormalTypeParameters(java.util.List):162 -> c
+    1:4:java.util.List visitTypeArguments(java.util.List):109:112 -> d
+    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> d
+    5:5:java.util.List visitTypeArguments(java.util.List):112 -> d
+    1:4:java.util.List visitMethodTypeSignatures(java.util.List):167:170 -> e
+    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> e
+    5:5:java.util.List visitMethodTypeSignatures(java.util.List):170 -> e
+    1:5:java.util.List visitSuperInterfaces(java.util.List):97:101 -> f
+    6:6:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> f
+    6:6:java.util.List visitSuperInterfaces(java.util.List):102 -> f
+    7:7:java.util.List visitSuperInterfaces(java.util.List):103:103 -> f
+com.android.tools.r8.graph.GenericSignaturePrinter -> com.android.tools.r8.graph.o0:
     com.android.tools.r8.naming.NamingLens namingLens -> a
     java.util.function.Predicate isTypeMissing -> b
     java.lang.StringBuilder sb -> c
@@ -22045,7 +22091,10 @@
     12:15:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):132:135 -> a
     16:16:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):142:142 -> a
     17:18:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):166:167 -> a
-    19:56:void printFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,boolean):173:210 -> a
+    19:33:void printFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,boolean):173:187 -> a
+    34:34:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):142:142 -> a
+    34:34:void printFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,boolean):188 -> a
+    35:55:void printFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,boolean):190:210 -> a
     1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):39:39 -> b
     2:4:java.util.List visitThrowsSignatures(java.util.List):68:70 -> b
     5:5:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):112:112 -> b
@@ -22056,89 +22105,172 @@
     1:3:java.util.List visitMethodTypeSignatures(java.util.List):50:52 -> e
     1:1:java.util.List visitSuperInterfaces(java.util.List):119:119 -> f
     1:1:java.lang.String toString():224:224 -> toString
-com.android.tools.r8.graph.GenericSignatureTypeRewriter -> com.android.tools.r8.graph.q0:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter -> com.android.tools.r8.graph.p0:
+    com.android.tools.r8.graph.GenericSignature$ClassTypeSignature objectTypeSignature -> e
     java.util.function.Predicate wasPruned -> b
     java.util.function.Function lookupType -> c
-    com.android.tools.r8.graph.DexProgramClass context -> d
-    com.android.tools.r8.graph.GenericSignature$FieldTypeSignature objectTypeSignature -> e
+    com.android.tools.r8.graph.DexType context -> d
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):37:41 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):36:36 -> <init>
-    7:12:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexProgramClass):49:54 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.graph.GenericSignatureTypeRewriter):26:26 -> a
-    2:2:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):58:58 -> a
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):34:39 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):33:33 -> <init>
+    8:13:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexType):46:51 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.graph.GenericSignatureTypeRewriter):23:23 -> a
+    2:2:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):55:55 -> a
     3:3:boolean com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature.isInvalid():0:0 -> a
-    3:3:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):58 -> a
-    4:4:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):61:61 -> a
-    5:5:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):84:84 -> a
-    5:5:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):61 -> a
-    6:6:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():233:233 -> a
-    6:6:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):85 -> a
-    6:6:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):61 -> a
-    7:10:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):85:88 -> a
-    7:10:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):61 -> a
-    11:11:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):65:65 -> a
+    3:3:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):55 -> a
+    4:4:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):58:58 -> a
+    5:5:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):81:81 -> a
+    5:5:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):58 -> a
+    6:6:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():238:238 -> a
+    6:6:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):82 -> a
+    6:6:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):58 -> a
+    7:10:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):82:85 -> a
+    7:10:com.android.tools.r8.graph.GenericSignature$ClassSignature rewrite(com.android.tools.r8.graph.GenericSignature$ClassSignature):58 -> a
+    11:11:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):62:62 -> a
     12:12:boolean com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature.isInvalid():0:0 -> a
-    12:12:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):65 -> a
-    13:15:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):68:70 -> a
-    16:19:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):74:77 -> a
-    20:20:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):95:95 -> a
-    20:20:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):77 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.graph.GenericSignatureTypeRewriter):26:26 -> b
-    1:1:java.util.function.Function access$300(com.android.tools.r8.graph.GenericSignatureTypeRewriter):26:26 -> c
-    1:1:java.util.function.Predicate access$400(com.android.tools.r8.graph.GenericSignatureTypeRewriter):26:26 -> d
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature access$500(com.android.tools.r8.graph.GenericSignatureTypeRewriter):26:26 -> e
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$1 -> com.android.tools.r8.graph.q0$a:
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter -> com.android.tools.r8.graph.q0$b:
+    12:12:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):62 -> a
+    13:15:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):65:67 -> a
+    16:19:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):71:74 -> a
+    20:20:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter.visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):92:92 -> a
+    20:20:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature rewrite(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):74 -> a
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature access$200(com.android.tools.r8.graph.GenericSignatureTypeRewriter):23:23 -> b
+    1:1:com.android.tools.r8.graph.DexType access$300(com.android.tools.r8.graph.GenericSignatureTypeRewriter):23:23 -> c
+    1:1:java.util.function.Function access$400(com.android.tools.r8.graph.GenericSignatureTypeRewriter):23:23 -> d
+    1:1:java.util.function.Predicate access$500(com.android.tools.r8.graph.GenericSignatureTypeRewriter):23:23 -> e
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$1 -> com.android.tools.r8.graph.p0$a:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter -> com.android.tools.r8.graph.p0$b:
     com.android.tools.r8.graph.GenericSignatureTypeRewriter this$0 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():80:80 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.GenericSignatureTypeRewriter):80:80 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignatureTypeRewriter$1):80:80 -> <init>
-    1:1:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):112:112 -> a
+    1:1:void <clinit>():77:77 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.GenericSignatureTypeRewriter):77:77 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignatureTypeRewriter$1):77:77 -> <init>
+    1:1:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):109:109 -> a
     2:2:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
-    2:2:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):112 -> a
-    3:3:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):115:115 -> a
-    4:4:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):130:130 -> a
-    5:15:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):171:181 -> a
-    16:16:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):197:197 -> a
-    17:20:java.util.List visitInterfaceBounds(java.util.List):205:208 -> a
-    21:21:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> a
-    21:21:java.util.List visitInterfaceBounds(java.util.List):208 -> a
-    22:22:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):218:218 -> a
-    23:24:com.android.tools.r8.graph.DexType visitType(com.android.tools.r8.graph.DexType):238:239 -> a
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):135:135 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():523:523 -> b
-    2:2:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):136 -> b
-    3:4:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):136:137 -> b
-    5:6:com.android.tools.r8.graph.GenericSignature$TypeSignature lambda$visitMethodTypeSignatures$0(com.android.tools.r8.graph.GenericSignature$TypeSignature):164:165 -> b
-    7:11:java.util.List visitThrowsSignatures(java.util.List):188:192 -> b
+    2:2:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):109 -> a
+    3:3:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):112:112 -> a
+    4:4:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):127:127 -> a
+    5:5:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():168:168 -> a
+    5:5:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):130 -> a
+    6:6:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):130:130 -> a
+    7:7:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():172:172 -> a
+    7:7:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):131 -> a
+    8:9:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):131:132 -> a
+    10:10:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():164:164 -> a
+    10:10:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):133 -> a
+    11:11:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):133:133 -> a
+    12:12:java.util.List com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getInterfaceBounds():172:172 -> a
+    12:12:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):133 -> a
+    13:13:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):133:133 -> a
+    14:24:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):176:186 -> a
+    25:25:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):202:202 -> a
+    26:29:java.util.List visitInterfaceBounds(java.util.List):207:210 -> a
+    30:30:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> a
+    30:30:java.util.List visitInterfaceBounds(java.util.List):210 -> a
+    31:31:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):220:220 -> a
+    32:33:com.android.tools.r8.graph.DexType visitType(com.android.tools.r8.graph.DexType):240:241 -> a
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):140:140 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():530:530 -> b
+    2:2:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):141 -> b
+    3:4:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):141:142 -> b
+    5:6:com.android.tools.r8.graph.GenericSignature$TypeSignature lambda$visitMethodTypeSignatures$0(com.android.tools.r8.graph.GenericSignature$TypeSignature):169:170 -> b
+    7:11:java.util.List visitThrowsSignatures(java.util.List):193:197 -> b
     12:12:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> b
-    12:12:java.util.List visitThrowsSignatures(java.util.List):192 -> b
-    13:15:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature lambda$visitTypeArguments$1(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):229:231 -> b
-    1:7:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):100:106 -> c
-    8:11:java.util.List visitFormalTypeParameters(java.util.List):122:125 -> c
+    12:12:java.util.List visitThrowsSignatures(java.util.List):197 -> b
+    13:15:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature lambda$visitTypeArguments$1(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):231:233 -> b
+    1:7:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):97:103 -> c
+    8:11:java.util.List visitFormalTypeParameters(java.util.List):119:122 -> c
     12:12:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> c
-    12:12:java.util.List visitFormalTypeParameters(java.util.List):125 -> c
-    13:13:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):152:152 -> c
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():523:523 -> c
-    14:14:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):153 -> c
-    15:15:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):153:153 -> c
-    1:4:java.util.List visitTypeArguments(java.util.List):223:226 -> d
+    12:12:java.util.List visitFormalTypeParameters(java.util.List):122 -> c
+    13:13:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):157:157 -> c
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():530:530 -> c
+    14:14:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):158 -> c
+    15:15:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):158:158 -> c
+    1:4:java.util.List visitTypeArguments(java.util.List):225:228 -> d
     5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> d
-    5:5:java.util.List visitTypeArguments(java.util.List):226 -> d
-    1:4:java.util.List visitMethodTypeSignatures(java.util.List):158:161 -> e
+    5:5:java.util.List visitTypeArguments(java.util.List):228 -> d
+    1:4:java.util.List visitMethodTypeSignatures(java.util.List):163:166 -> e
     5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> e
-    5:5:java.util.List visitMethodTypeSignatures(java.util.List):161 -> e
-    1:4:java.util.List visitSuperInterfaces(java.util.List):144:147 -> f
+    5:5:java.util.List visitMethodTypeSignatures(java.util.List):166 -> e
+    1:4:java.util.List visitSuperInterfaces(java.util.List):149:152 -> f
     5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):134:134 -> f
-    5:5:java.util.List visitSuperInterfaces(java.util.List):147 -> f
-com.android.tools.r8.graph.GenericSignatureUtils -> com.android.tools.r8.graph.r0:
+    5:5:java.util.List visitSuperInterfaces(java.util.List):152 -> f
+com.android.tools.r8.graph.GenericSignatureTypeVariableRemover -> com.android.tools.r8.graph.q0:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.function.Predicate innerClassPruned -> b
+    java.util.function.Predicate enclosingClassOrMethodPruned -> c
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.function.Predicate):23:26 -> <init>
+    1:1:void removeDeadGenericSignatureTypeVariables(com.android.tools.r8.graph.DexProgramClass):30:30 -> a
+    2:2:boolean com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature.isInvalid():0:0 -> a
+    2:2:void removeDeadGenericSignatureTypeVariables(com.android.tools.r8.graph.DexProgramClass):30 -> a
+    3:10:void removeDeadGenericSignatureTypeVariables(com.android.tools.r8.graph.DexProgramClass):33:40 -> a
+    11:14:void removeDeadGenericSignatureTypeVariables(com.android.tools.r8.graph.DexProgramClass):39:42 -> a
+    15:15:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):51:51 -> a
+    15:15:void removeDeadGenericSignatureTypeVariables(com.android.tools.r8.graph.DexProgramClass):42 -> a
+    16:16:void com.android.tools.r8.graph.DexClass.setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):1001:1001 -> a
+    16:16:void removeDeadGenericSignatureTypeVariables(com.android.tools.r8.graph.DexProgramClass):41 -> a
+    17:30:void removeDeadGenericSignatureTypeVariables(com.android.tools.r8.graph.DexProgramClass):44:57 -> a
+    31:36:void lambda$removeDeadGenericSignatureTypeVariables$0(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):47:52 -> a
+    37:37:void lambda$removeDeadGenericSignatureTypeVariables$0(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):51:51 -> a
+    38:38:void lambda$removeDeadGenericSignatureTypeVariables$0(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> a
+    39:43:void lambda$removeDeadGenericSignatureTypeVariables$1(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):59:63 -> a
+    44:44:void lambda$removeDeadGenericSignatureTypeVariables$1(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):62:62 -> a
+    45:45:void lambda$removeDeadGenericSignatureTypeVariables$1(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):61:61 -> a
+    46:52:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):70:76 -> a
+    53:53:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():238:238 -> a
+    53:53:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):76 -> a
+    54:67:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):76:89 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> a
+    68:68:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):89 -> a
+    69:69:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):91:91 -> a
+    70:70:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():802:802 -> a
+    70:70:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):91 -> a
+    71:78:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):91:98 -> a
+    79:79:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():238:238 -> a
+    79:79:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):98 -> a
+    80:82:void getPrunedTypeParameters(com.android.tools.r8.graph.DexClass,java.util.Map,boolean):98:100 -> a
+    83:83:void updateMap(java.util.List,java.util.Map):108:108 -> a
+    84:84:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():164:164 -> a
+    84:84:void lambda$updateMap$2(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):110 -> a
+    85:85:void lambda$updateMap$2(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):110:110 -> a
+    86:86:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getClassBound():168:168 -> a
+    86:86:void lambda$updateMap$2(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):116 -> a
+    87:89:void lambda$updateMap$2(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):118:120 -> a
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():530:530 -> a
+    90:90:void lambda$updateMap$2(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):120 -> a
+    91:91:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():164:164 -> a
+    91:91:void lambda$updateMap$2(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):122 -> a
+    92:92:void lambda$updateMap$2(java.util.Map,com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):122:122 -> a
+com.android.tools.r8.graph.GenericSignatureTypeVisitor -> com.android.tools.r8.graph.r0:
+    java.util.function.BiConsumer visitedTypeConsumer -> b
+    com.android.tools.r8.graph.ProgramDefinition context -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.ProgramDefinition,java.util.function.BiConsumer):23:25 -> <init>
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):72:72 -> a
+    2:2:java.util.List visitInterfaceBounds(java.util.List):80:80 -> a
+    3:3:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):111:111 -> a
+    4:4:boolean com.android.tools.r8.graph.GenericSignature$TypeSignature.isBaseTypeSignature():0:0 -> a
+    4:4:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):111 -> a
+    5:6:com.android.tools.r8.graph.GenericSignature$TypeSignature visitTypeSignature(com.android.tools.r8.graph.GenericSignature$TypeSignature):114:115 -> a
+    7:7:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSimpleClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):120:120 -> a
+    8:11:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):125:128 -> a
+    12:12:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):152:152 -> a
+    13:13:com.android.tools.r8.graph.DexType visitType(com.android.tools.r8.graph.DexType):157:157 -> a
+    1:15:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):46:60 -> b
+    16:16:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):91:91 -> b
+    17:17:java.util.List visitThrowsSignatures(java.util.List):140:140 -> b
+    1:1:java.util.List visitFormalTypeParameters(java.util.List):66:66 -> c
+    2:2:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitInterfaceBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):86:86 -> c
+    3:3:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):106:106 -> c
+    1:1:java.util.List visitTypeArguments(java.util.List):146:146 -> d
+    1:1:java.util.List visitMethodTypeSignatures(java.util.List):134:134 -> e
+    1:1:java.util.List visitSuperInterfaces(java.util.List):100:100 -> f
+com.android.tools.r8.graph.GenericSignatureUtils -> com.android.tools.r8.graph.s0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:11:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):13:23 -> a
     12:12:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):19:19 -> a
-com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.internal.Pd:
+com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.internal.ke:
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature) -> a
     java.util.List visitInterfaceBounds(java.util.List) -> a
     com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType) -> a
@@ -22151,7 +22283,7 @@
     java.util.List visitTypeArguments(java.util.List) -> d
     java.util.List visitMethodTypeSignatures(java.util.List) -> e
     java.util.List visitSuperInterfaces(java.util.List) -> f
-com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.s0:
+com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.t0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens$1):50:50 -> <init>
@@ -22169,7 +22301,7 @@
     java.lang.String lookupPackageName(java.lang.String) -> a
     1:9:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):307:315 -> a
     1:9:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):300 -> a
-    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):538:538 -> a
+    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):542:542 -> a
     10:10:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):316 -> a
     10:10:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):300 -> a
     11:11:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):317:317 -> a
@@ -22228,15 +22360,15 @@
     boolean isIdentityLens() -> f
     boolean isMemberRebindingLens() -> g
     boolean isNonIdentityLens() -> h
-com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.s0$a:
-com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.graph.s0$b:
+com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.t0$a:
+com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.graph.t0$b:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
     java.util.Map typeMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> a
     1:1:void <init>():240:240 -> <init>
     2:5:void <init>():235:238 -> <init>
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):253:253 -> a
-com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.s0$c:
+com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.t0$c:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):854:854 -> <init>
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):859:859 -> a
     2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):869:869 -> a
@@ -22252,7 +22384,7 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():930:930 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.s0$d:
+com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.t0$d:
     com.android.tools.r8.graph.DexType castType -> c
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens$1):114:114 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):119:120 -> <init>
@@ -22260,7 +22392,7 @@
     2:2:com.android.tools.r8.graph.DexType getRewrittenCastType(java.util.function.Function):136:136 -> a
     1:1:com.android.tools.r8.graph.DexType getCastType():132:132 -> d
     1:1:boolean hasCastType():128:128 -> e
-com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder -> com.android.tools.r8.graph.t0:
+com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder -> com.android.tools.r8.graph.u0:
     com.android.tools.r8.graph.DexType castType -> c
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$1):139:139 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.GraphLens):144:144 -> <init>
@@ -22271,7 +22403,7 @@
     com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder self() -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:97 -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReference(com.android.tools.r8.graph.DexMember):0 -> b
-com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.s0$e:
+com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.t0$e:
     com.android.tools.r8.graph.GraphLens$IdentityGraphLens INSTANCE -> b
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():743:745 -> <clinit>
@@ -22283,18 +22415,15 @@
     java.lang.String lookupPackageName(java.lang.String) -> a
     1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):811:811 -> a
     2:3:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> a
-    2:3:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
     2:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):811 -> a
     4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):811:811 -> a
     5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):826:826 -> a
     6:7:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> a
-    6:7:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
     6:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):826 -> a
     8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):826:826 -> a
     9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):825:825 -> a
     10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):835:835 -> a
     11:12:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> a
-    11:12:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
     11:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):835 -> a
     13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):835:835 -> a
     14:14:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):834:834 -> a
@@ -22309,11 +22438,11 @@
     boolean isNonIdentityLens() -> h
     1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens getInstance():750:750 -> i
     1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():743 -> i
-com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.s0$f:
+com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.t0$f:
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> a
-com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.s0$g:
+com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.t0$g:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
-com.android.tools.r8.graph.GraphLens$MemberLookupResult -> com.android.tools.r8.graph.s0$h:
+com.android.tools.r8.graph.GraphLens$MemberLookupResult -> com.android.tools.r8.graph.t0$h:
     com.android.tools.r8.graph.DexMember reference -> a
     com.android.tools.r8.graph.DexMember reboundReference -> b
     1:1:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.GraphLens$1):52:52 -> <init>
@@ -22324,18 +22453,18 @@
     1:1:com.android.tools.r8.graph.DexMember getReference():63:63 -> b
     2:2:com.android.tools.r8.graph.DexMember getRewrittenReference(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):67:67 -> b
     1:1:boolean hasReboundReference():75:75 -> c
-com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder -> com.android.tools.r8.graph.u0:
+com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder -> com.android.tools.r8.graph.v0:
     com.android.tools.r8.graph.DexMember reference -> a
     com.android.tools.r8.graph.DexMember reboundReference -> b
     1:1:void <init>():91:91 -> <init>
-com.android.tools.r8.graph.GraphLens$MethodLookupResult -> com.android.tools.r8.graph.s0$i:
+com.android.tools.r8.graph.GraphLens$MethodLookupResult -> com.android.tools.r8.graph.t0$i:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> d
     com.android.tools.r8.ir.code.Invoke$Type type -> c
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.RewrittenPrototypeDescription):182:184 -> <init>
     1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder builder(com.android.tools.r8.graph.GraphLens):188:188 -> a
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():196:196 -> d
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():192:192 -> e
-com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder -> com.android.tools.r8.graph.v0:
+com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder -> com.android.tools.r8.graph.w0:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> c
     com.android.tools.r8.ir.code.Invoke$Type type -> d
     boolean $assertionsDisabled -> e
@@ -22351,7 +22480,7 @@
     com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder self() -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:97 -> b
     1:1:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReference(com.android.tools.r8.graph.DexMember):0 -> b
-com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.s0$j:
+com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.t0$j:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map arrayTypeCache -> d
     boolean $assertionsDisabled -> e
@@ -22379,7 +22508,6 @@
     14:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):661:661 -> a
     18:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):663:664 -> a
     20:21:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> a
-    20:21:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
     20:21:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):664 -> a
     22:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):664:669 -> a
     28:28:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):704:704 -> a
@@ -22400,26 +22528,26 @@
     boolean isNonIdentityLens() -> h
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():630:630 -> i
     1:1:com.android.tools.r8.graph.GraphLens getPrevious():634:634 -> j
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.w0:
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.x0:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):14:14 -> a
-com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.Lf:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.gg:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.InitClassLens$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.graph.DefaultInitClassLens getDefault():17:17 -> b
-com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.Lf$a:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.gg$a:
     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.Xf:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.sg:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -22434,7 +22562,7 @@
     8:12:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):82:86 -> a
     13:13:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):83:83 -> a
     14:18:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):91:95 -> a
-    19:19:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):265:265 -> a
+    19:19:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):269:269 -> a
     19:19:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):96 -> a
     20:34:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> a
     1:1:com.android.tools.r8.graph.DexType getInner():70:70 -> b
@@ -22443,9 +22571,9 @@
     1:1:boolean isAnonymous():62:62 -> e
     1:1:boolean isNamed():58:58 -> f
     1:4:java.lang.String toString():124:127 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.og:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.Jg:
     void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer) -> a
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.x0:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.y0:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -22480,7 +22608,7 @@
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):55:56 -> g
     5:5:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.org.objectweb.asm.Type):51:51 -> g
     5:5:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):56 -> g
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.y0:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.z0:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     boolean $assertionsDisabled -> e
@@ -22541,7 +22669,7 @@
     9:11:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):182:182 -> b
     13:17:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:188 -> b
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):147:147 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.y0$a:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.z0$a:
     java.util.List values -> d
     java.util.List names -> c
     com.android.tools.r8.graph.JarApplicationReader application -> a
@@ -22566,7 +22694,7 @@
     96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1055:1055 -> a
     96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1083 -> a
     96:96:void visit(java.lang.String,java.lang.Object):958 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.y0$b:
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.z0$b:
     com.android.tools.r8.graph.ClassKind classKind -> d
     com.android.tools.r8.graph.DexType superType -> l
     com.android.tools.r8.graph.DexType type -> j
@@ -22686,7 +22814,7 @@
     159:159:void visitEnd():434 -> a
     160:160:void checkRecord():503:503 -> a
     160:160:void visitEnd():434 -> a
-    161:161:boolean com.android.tools.r8.utils.InternalOptions.enableExperimentalRecordDesugaring():507:507 -> a
+    161:161:boolean com.android.tools.r8.utils.InternalOptions.enableExperimentalRecordDesugaring():510:510 -> a
     161:161:void checkRecord():503 -> a
     161:161:void visitEnd():434 -> a
     162:169:void checkRecord():508:515 -> a
@@ -22755,7 +22883,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):191:191 -> j
     1:1:java.util.List access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):191:191 -> k
     1:1:com.android.tools.r8.graph.ClassKind access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):191:191 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.y0$c:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.z0$c:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> i
@@ -22785,7 +22913,7 @@
     59:62:java.util.List getAnnotations():713:716 -> a
     59:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):636 -> a
     63:63:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):636:636 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.y0$d:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.z0$d:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -22825,7 +22953,7 @@
     1:2:void visitEnd():862:863 -> c
     3:4:boolean classRequiresCode():854:855 -> c
     3:4:void visitEnd():863 -> c
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1472:1472 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1483:1483 -> c
     5:5:boolean classRequiresCode():855 -> c
     5:5:void visitEnd():863 -> c
     6:8:boolean classRequiresCode():855:857 -> c
@@ -22852,12 +22980,12 @@
     83:83:void visitEnd():909:909 -> c
     84:92:void visitEnd():907:915 -> c
     1:4:java.util.List getAnnotations():931:934 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.y0$e:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.z0$e:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1087:1094 -> <init>
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.E0:
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.F0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.graph.JarApplicationReader application -> d
@@ -22900,8 +23028,8 @@
     1:1:boolean computeEquals(java.lang.Object):195:195 -> g
     2:2:boolean estimatedSizeForInliningAtMost(int):210:210 -> g
     1:1:java.lang.String toString():260:260 -> toString
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.z0:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.A0:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.A0:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.B0:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions debugParsingOptions -> h
@@ -22910,12 +23038,12 @@
     com.android.tools.r8.graph.DexClass clazz -> c
     1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):304:310 -> <init>
     1:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):316:326 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.ro:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.Oo:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
     1:4:void <init>(boolean,boolean,int):159:162 -> <init>
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.B0:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.C0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     int methodIndex -> b
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode$1):272:272 -> <init>
@@ -22924,9 +23052,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):272:272 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):284:284 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):272 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.C0:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.D0:
     1:1:void <init>(java.lang.String):93:93 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.D0:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.E0:
     int maxLocals -> n
     java.util.List localVariables -> r
     java.util.List tryCatchRanges -> q
@@ -23220,7 +23348,7 @@
     4:8:void visitVarInsn(int,int):716:720 -> d
     9:38:void visitVarInsn(int,int):712:741 -> d
     39:39:void visitVarInsn(int,int):732:732 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.F0:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.G0:
     com.android.tools.r8.utils.ProgramClassCollection programClasses -> h
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> j
     boolean $assertionsDisabled -> k
@@ -23242,8 +23370,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():256:256 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():190:190 -> h
     1:1:java.lang.String toString():266:266 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.F0$a:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.F0$b:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.G0$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.G0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> c
@@ -23257,7 +23385,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():165:165 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():157:157 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.F0$c:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.G0$c:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> j
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> k
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> i
@@ -23270,9 +23398,9 @@
     2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):230:232 -> b
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
     1:4:com.android.tools.r8.graph.LazyLoadedDexApplication build():237:240 -> f
-com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.Eo:
+com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.bp:
     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.G0:
+com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.H0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):11:11 -> <init>
@@ -23282,9 +23410,9 @@
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> a
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> a
-com.android.tools.r8.graph.LibraryMember -> com.android.tools.r8.internal.Go:
+com.android.tools.r8.graph.LibraryMember -> com.android.tools.r8.internal.dp:
     com.android.tools.r8.graph.DexLibraryClass getHolder() -> a
-com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.H0:
+com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.I0:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):11:11 -> <init>
@@ -23294,7 +23422,7 @@
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> a
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> a
-com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.I0:
+com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.J0:
     java.util.Set pinnedMethods -> c
     com.android.tools.r8.graph.PinnedPredicate pinnedPredicate -> a
     java.util.Set pinnedInstantiations -> b
@@ -23308,13 +23436,13 @@
     13:21:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):48:56 -> a
     22:23:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):66:67 -> a
     22:23:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):510:510 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):514:514 -> a
     24:24:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):71 -> a
     24:24:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     25:31:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:79 -> a
     25:31:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     32:35:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):58:61 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.Np:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.kq:
     com.android.tools.r8.graph.DexClassAndMethod method -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -23322,22 +23450,22 @@
     1:1:com.android.tools.r8.graph.DexClassAndMethod getImplementationMethod():30:30 -> a
     boolean isLambdaTarget() -> k
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> n
-com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.J0:
+com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.K0:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess asLookupResultSuccess() -> a
     void forEach(java.util.function.Consumer,java.util.function.Consumer) -> a
     1:1:void forEach(java.util.function.Consumer):32:32 -> a
     boolean isLookupResultFailure() -> b
     boolean isLookupResultSuccess() -> c
-com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.J0$a:
-com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.J0$b:
+com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.K0$a:
+com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.K0$b:
     com.android.tools.r8.graph.LookupResult$LookupResultFailure INSTANCE -> a
     1:1:void <clinit>():142:142 -> <clinit>
     1:1:void <init>():144:144 -> <init>
     void forEach(java.util.function.Consumer,java.util.function.Consumer) -> a
     boolean isLookupResultFailure() -> b
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultFailure access$100():140:140 -> d
-com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.J0$c:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.K0$c:
     java.util.Map methodTargets -> a
     java.util.List lambdaTargets -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState state -> c
@@ -23356,23 +23484,23 @@
     1:1:boolean isComplete():113:113 -> g
     1:1:boolean isIncomplete():109:109 -> h
     1:1:void setIncomplete():118:118 -> i
-com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState -> com.android.tools.r8.graph.J0$c$a:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState -> com.android.tools.r8.graph.K0$c$a:
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState Incomplete -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState Complete -> a
     1:2:void <clinit>():135:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):134:134 -> <init>
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.Pp:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.mq:
     boolean isLambdaTarget() -> k
     com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> l
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> n
     boolean isMethodTarget() -> o
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.Bq:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.Zq:
     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
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> e
     boolean isSuccessfulMemberResolutionResult() -> f
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.K0:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.L0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
@@ -23431,7 +23559,7 @@
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):98 -> j
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     com.android.tools.r8.graph.AccessFlags self() -> x
-com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.K0$a:
+com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.L0$a:
     1:1:void <init>():229:229 -> <init>
     com.android.tools.r8.graph.AccessFlags$BuilderBase self() -> a
     1:5:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPrivate(boolean):325:329 -> a
@@ -23459,79 +23587,92 @@
     4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder setSynchronized(boolean):255 -> e
     5:5:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setStatic():355:355 -> e
     5:5:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():0 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.graph.N0:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
     java.util.Map superInvokes -> d
     java.util.Map virtualInvokes -> e
-    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):19:19 -> <init>
-    2:7:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):32:37 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder concurrentBuilder():41:41 -> a
-    2:7:void forEachMethodReference(java.util.function.Consumer):54:59 -> a
-    8:8:void forEachDirectInvoke(java.util.function.BiConsumer):63:63 -> a
-    9:9:void forEachSuperInvokeContext(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):79:79 -> a
-    10:15:com.android.tools.r8.graph.MethodAccessInfoCollection rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):92:97 -> a
-    16:16:java.util.Map rewriteInvokesWithLens(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):102:102 -> a
-    17:17:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteInvokesWithLens$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.collections.ProgramMethodSet):106:106 -> a
-    18:18:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteInvokesWithLens$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):108:108 -> a
-    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder identityBuilder():45:45 -> b
-    2:2:void forEachInterfaceInvoke(java.util.function.BiConsumer):67:67 -> b
-    3:3:void forEachVirtualInvokeContext(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):87:87 -> b
-    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier modifier():49:49 -> c
-    2:2:void forEachStaticInvoke(java.util.function.BiConsumer):71:71 -> c
-    1:1:void forEachSuperInvoke(java.util.function.BiConsumer):75:75 -> d
-    1:1:void forEachVirtualInvoke(java.util.function.BiConsumer):83:83 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.Pq:
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.Qq$a:
+    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):20:20 -> <init>
+    2:7:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):33:38 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder concurrentBuilder():42:42 -> a
+    2:7:void forEachMethodReference(java.util.function.Consumer):55:60 -> a
+    8:8:void forEachDirectInvoke(java.util.function.BiConsumer):64:64 -> a
+    9:9:void forEachSuperInvokeContext(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):80:80 -> a
+    10:16:com.android.tools.r8.graph.MethodAccessInfoCollection rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):93:99 -> a
+    17:17:void rewriteInvokesWithLens(com.android.tools.r8.graph.MethodAccessInfoCollection$Builder,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.Invoke$Type):108:108 -> a
+    18:24:void lambda$rewriteInvokesWithLens$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.MethodAccessInfoCollection$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):110:116 -> a
+    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder identityBuilder():46:46 -> b
+    2:2:void forEachInterfaceInvoke(java.util.function.BiConsumer):68:68 -> b
+    3:3:void forEachVirtualInvokeContext(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):88:88 -> b
+    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier modifier():50:50 -> c
+    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$1 -> com.android.tools.r8.graph.M0:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.graph.N0$a:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
     java.util.Map superInvokes -> d
+    boolean $assertionsDisabled -> f
     java.util.Map virtualInvokes -> e
-    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):113:113 -> <init>
-    2:2:void <init>(java.util.function.Supplier,com.android.tools.r8.graph.MethodAccessInfoCollection$1):113:113 -> <init>
-    3:3:void <init>(java.util.function.Supplier):122:122 -> <init>
-    4:9:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):126:131 -> <init>
-    1:1:boolean com.android.tools.r8.graph.MethodAccessInfoCollection$Builder.registerInvokeDirectInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):155:155 -> a
-    1:1:void lambda$registerInvokeDirectInContexts$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):159 -> a
-    2:2:void registerInvokeDirectInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):159:159 -> a
-    3:5:boolean registerInvokeMethodInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Map):199:201 -> a
-    6:6:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$registerInvokeMethodInContext$5(com.android.tools.r8.graph.DexMethod):200:200 -> a
-    7:7:com.android.tools.r8.graph.MethodAccessInfoCollection build():205:205 -> a
-    1:1:java.util.Map getDirectInvokes():135:135 -> b
-    2:2:boolean com.android.tools.r8.graph.MethodAccessInfoCollection$Builder.registerInvokeInterfaceInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):164:164 -> b
-    2:2:void lambda$registerInvokeInterfaceInContexts$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):169 -> b
-    3:3:void registerInvokeInterfaceInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):169:169 -> b
-    1:1:java.util.Map getInterfaceInvokes():139:139 -> c
-    2:2:boolean com.android.tools.r8.graph.MethodAccessInfoCollection$Builder.registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):173:173 -> c
-    2:2:void lambda$registerInvokeStaticInContexts$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):177 -> c
-    3:3:void registerInvokeStaticInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):177:177 -> c
-    1:1:java.util.Map getStaticInvokes():143:143 -> d
-    2:2:boolean com.android.tools.r8.graph.MethodAccessInfoCollection$Builder.registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):181:181 -> d
-    2:2:void lambda$registerInvokeSuperInContexts$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):185 -> d
-    3:3:void registerInvokeSuperInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):185:185 -> d
-    1:1:java.util.Map getSuperInvokes():147:147 -> e
-    2:2:boolean com.android.tools.r8.graph.MethodAccessInfoCollection$Builder.registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):189:189 -> e
-    2:2:void lambda$registerInvokeVirtualInContexts$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):194 -> e
-    3:3:void registerInvokeVirtualInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):194:194 -> e
-    1:1:java.util.Map getVirtualInvokes():151:151 -> f
-    2:2:boolean registerInvokeDirectInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):155:155 -> f
-    1:1:boolean registerInvokeInterfaceInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):164:164 -> g
-    1:1:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):173:173 -> h
-    1:1:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):181:181 -> i
-    1:1:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):189:189 -> j
-com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.Rq:
-    1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):210:210 -> <init>
-    2:2:void <init>():214:214 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.Qq$b:
-    1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):218:218 -> <init>
-    2:2:void <init>():222:222 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.Sq:
-    1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.MethodAccessInfoCollection$1):226:226 -> <init>
-    2:2:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):234:234 -> <init>
-    1:5:void addAll(com.android.tools.r8.graph.MethodAccessInfoCollection):238:242 -> a
-com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.Tq:
+    1:1:void <clinit>():121:121 -> <clinit>
+    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):121:121 -> <init>
+    2:2:void <init>(java.util.function.Supplier,com.android.tools.r8.graph.MethodAccessInfoCollection$1):121:121 -> <init>
+    3:3:void <init>(java.util.function.Supplier):130:130 -> <init>
+    4:9:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):134:139 -> <init>
+    1:13:boolean registerInvokeInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke$Type):164:176 -> a
+    14:14:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):216:216 -> a
+    14:14:boolean registerInvokeInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke$Type):174 -> a
+    15:15:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):208:208 -> a
+    15:15:boolean registerInvokeInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke$Type):172 -> a
+    16:16:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> a
+    16:16:boolean registerInvokeInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke$Type):170 -> a
+    17:17:boolean registerInvokeInterfaceInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):191:191 -> a
+    17:17:boolean registerInvokeInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke$Type):168 -> a
+    18:18:boolean registerInvokeDirectInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):182:182 -> a
+    18:18:boolean registerInvokeInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke$Type):166 -> a
+    19:19:boolean registerInvokeInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke$Type):176:176 -> a
+    20:20:boolean registerInvokeDirectInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):182:182 -> a
+    20:20:void lambda$registerInvokeDirectInContexts$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):186 -> a
+    21:21:void registerInvokeDirectInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):186:186 -> a
+    22:24:boolean registerInvokeMethodInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Map):226:228 -> a
+    25:25:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$registerInvokeMethodInContext$5(com.android.tools.r8.graph.DexMethod):227:227 -> a
+    26:26:com.android.tools.r8.graph.MethodAccessInfoCollection build():232:232 -> a
+    1:1:java.util.Map getDirectInvokes():143:143 -> b
+    2:2:boolean registerInvokeInterfaceInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):191:191 -> b
+    2:2:void lambda$registerInvokeInterfaceInContexts$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):196 -> b
+    3:3:void registerInvokeInterfaceInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):196:196 -> b
+    1:1:java.util.Map getInterfaceInvokes():147:147 -> c
+    2:2:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> c
+    2:2:void lambda$registerInvokeStaticInContexts$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):204 -> c
+    3:3:void registerInvokeStaticInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):204:204 -> c
+    1:1:java.util.Map getStaticInvokes():151:151 -> d
+    2:2:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):208:208 -> d
+    2:2:void lambda$registerInvokeSuperInContexts$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):212 -> d
+    3:3:void registerInvokeSuperInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):212:212 -> d
+    1:1:java.util.Map getSuperInvokes():155:155 -> e
+    2:2:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):216:216 -> e
+    2:2:void lambda$registerInvokeVirtualInContexts$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):221 -> e
+    3:3:void registerInvokeVirtualInContexts(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):221:221 -> e
+    1:1:java.util.Map getVirtualInvokes():159:159 -> f
+    2:2:boolean registerInvokeDirectInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):182:182 -> f
+    1:1:boolean registerInvokeInterfaceInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):191:191 -> g
+    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.graph.O0:
+    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.graph.N0$b:
+    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.graph.P0:
+    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
+com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.mr:
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> b
     com.android.tools.r8.graph.DexEncodedMethod[] directMethods -> a
     boolean $assertionsDisabled -> c
@@ -23606,7 +23747,7 @@
     1:2:boolean verifyNoDuplicateMethods():26:27 -> j
     3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> j
     3:3:boolean verifyNoDuplicateMethods():27 -> j
-com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.internal.Uq:
+com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.internal.nr:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.graph.MethodCollectionBacking backing -> b
     com.android.tools.r8.graph.DexEncodedMethod cachedClassInitializer -> c
@@ -23737,7 +23878,7 @@
     2:2:boolean verify():336 -> l
     3:3:boolean verify():340:340 -> l
     1:1:java.lang.Iterable virtualMethods():149:149 -> m
-com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.internal.Vq:
+com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.internal.or:
     1:1:void <init>():15:15 -> <init>
     void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void addDirectMethods(java.util.Collection) -> a
@@ -23778,7 +23919,7 @@
     int size() -> g
     boolean verify() -> h
     java.lang.Iterable virtualMethods() -> i
-com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.dr:
+com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.wr:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap methodMap -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -23932,11 +24073,11 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap():43 -> j
     1:1:java.util.Iterator lambda$directMethods$1():116:116 -> k
     1:1:java.util.Iterator lambda$virtualMethods$2():121:121 -> l
-com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.ls:
+com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.Es:
     1:1:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13:13 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens.run(java.lang.Object,java.lang.Object,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):20:21 -> a
     2:3:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13 -> a
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.Ls:
     com.android.tools.r8.graph.DexType nestHost -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -23948,7 +24089,7 @@
     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 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.Ms:
     com.android.tools.r8.graph.DexType nestMember -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -23960,7 +24101,7 @@
     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 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
-com.android.tools.r8.graph.NestedGraphLens -> com.android.tools.r8.graph.L0:
+com.android.tools.r8.graph.NestedGraphLens -> com.android.tools.r8.graph.Q0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap EMPTY_METHOD_MAP -> k
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap fieldMap -> f
@@ -23984,11 +24125,9 @@
     10:20:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):170:180 -> a
     21:24:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):178:181 -> a
     25:26:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> a
-    25:26:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
     25:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):182 -> a
     27:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):182:182 -> a
     28:29:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):102:103 -> a
-    28:29:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):0 -> a
     28:29:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):183 -> a
     30:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):183:186 -> a
     34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):185:185 -> a
@@ -23996,7 +24135,6 @@
     41:41:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):188:188 -> a
     42:55:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):187:200 -> a
     56:57:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> a
-    56:57:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
     56:57:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):201 -> a
     58:60:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):201:203 -> a
     61:64:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):202:205 -> a
@@ -24014,15 +24152,12 @@
     4:12:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):142:150 -> b
     13:16:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):148:151 -> b
     17:18:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):102:103 -> b
-    17:18:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):0 -> b
     17:18:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):152 -> b
     19:19:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):152:152 -> b
     20:21:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> b
-    20:21:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> b
     20:21:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):153 -> b
     22:29:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):153:160 -> b
     30:31:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):97:98 -> b
-    30:31:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> b
     30:31:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):161 -> b
     32:34:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):161:163 -> b
     35:35:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):242:242 -> b
@@ -24041,8 +24176,8 @@
     4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):232:232 -> g
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:26:java.lang.String toString():293:318 -> toString
-com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.Xt:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.au:
+com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.ru:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.uu:
     java.util.Map classesWithAllocationSiteTracking -> a
     java.util.Map instantiatedLambdas -> d
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> c
@@ -24076,8 +24211,8 @@
     2:2:boolean lambda$removeAllocationsForPrunedItems$5(java.util.Set,com.android.tools.r8.graph.DexProgramClass):231:231 -> b
     1:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):79:86 -> c
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):112:112 -> d
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.Yt:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.au$a:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.su:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.uu$a:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():255:255 -> <clinit>
@@ -24090,7 +24225,7 @@
     14:21: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):324 -> a
     22:31:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):325:334 -> a
     32:32:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):341:341 -> a
-    33:33:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
+    33:33:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
     33:33:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):342 -> a
     34:36:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):342:344 -> a
     37:37:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):352:352 -> a
@@ -24130,14 +24265,14 @@
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):328:328 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$7(com.android.tools.r8.graph.DexProgramClass):440:440 -> f
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):404:406 -> g
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.Zt:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.tu:
     com.android.tools.r8.shaking.GraphReporter reporter -> b
     boolean trackAllocationSites -> a
     1:1:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1):257:257 -> <init>
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):262:264 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):257:257 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):257:257 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.Bu:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.Vu:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.utils.structural.CompareToVisitor compareToVisitor -> m
     com.android.tools.r8.graph.DexProgramClass[] classes -> d
@@ -24193,12 +24328,12 @@
     1:1:java.util.Collection getStrings():264:264 -> l
     1:1:java.util.Collection getTypes():252:252 -> m
     1:1:boolean hasJumboStrings():276:276 -> n
-com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.Bu$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.Vu$a:
     com.android.tools.r8.graph.ObjectToOffsetMapping val$mapping -> e
     1:1:void <init>(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction,com.android.tools.r8.graph.ObjectToOffsetMapping):112:112 -> <init>
     1:1:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):116:116 -> a
     2:4:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):121:121 -> a
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.Bu$b:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.Vu$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
     1:1:void <init>(com.android.tools.r8.graph.AppInfo):176:176 -> <init>
@@ -24210,7 +24345,7 @@
     19:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     19:19:int getDepth(com.android.tools.r8.graph.DexProgramClass):199 -> a
     20:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):200:203 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.bv:
     com.android.tools.r8.graph.DexProto[] protos -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
     boolean $assertionsDisabled -> i
@@ -24250,7 +24385,7 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.M0:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.R0:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
@@ -24280,9 +24415,9 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():80:80 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     1:1:int size():135:135 -> size
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.wv:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.Qv:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.nw:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.Hw:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.Set visited -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):32:32 -> <init>
@@ -24294,7 +24429,7 @@
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     20:21:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
-com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.Iw:
     boolean isProgramField() -> B
     com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext) -> a
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> c
@@ -24306,16 +24441,16 @@
     com.android.tools.r8.graph.ProgramField asProgramField() -> s
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> w
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> y
-com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.pw:
+com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.Jw:
     1:1:boolean isProgramContext():12:12 -> q
     com.android.tools.r8.graph.Definition getContext() -> r
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.qw:
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.Kw:
     com.android.tools.r8.graph.ProgramMethod method -> b
     com.android.tools.r8.graph.DexCode code -> a
     1:3:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod):12:14 -> <init>
     1:1:com.android.tools.r8.graph.DexCode getCode():18:18 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getMethod():22:22 -> b
-com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.S0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):13:13 -> <init>
@@ -24324,12 +24459,12 @@
     1:1:com.android.tools.r8.graph.DexDefinition getDefinition():9:9 -> g
     com.android.tools.r8.graph.Definition getContext() -> r
     com.android.tools.r8.graph.ProgramField asProgramField() -> s
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.sw:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.Mw:
     com.android.tools.r8.graph.DexProgramClass getHolder() -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getContextClass():12:12 -> c
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> g
     com.android.tools.r8.graph.DexType getHolderType() -> j
-com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.O0:
+com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.T0:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):21:21 -> <init>
@@ -24343,7 +24478,7 @@
     1:1:com.android.tools.r8.graph.DexDefinition getDefinition():17:17 -> g
     com.android.tools.r8.graph.Definition getContext() -> r
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> y
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.ww:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.Qw:
     java.lang.String packageDescriptor -> a
     java.util.Set classes -> b
     boolean $assertionsDisabled -> c
@@ -24364,7 +24499,7 @@
     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.xw:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.Rw:
     java.util.Map packages -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:2:void <init>(java.util.Map):15:16 -> <init>
@@ -24373,7 +24508,7 @@
     1:2:boolean contains(com.android.tools.r8.graph.DexProgramClass):39:40 -> b
     1:1:boolean isEmpty():44:44 -> isEmpty
     1:1:java.util.Iterator iterator():49:49 -> iterator
-com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.yy:
+com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.Qy:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -24388,8 +24523,8 @@
     1:1:java.util.Set getRemovedClasses():62:62 -> e
     1:1:boolean hasRemovedClasses():58:58 -> f
     1:1:boolean isEmpty():38:38 -> g
-com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.xy:
-com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.yy$a:
+com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.Py:
+com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.Qy$a:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -24400,7 +24535,7 @@
     3:3:com.android.tools.r8.graph.PrunedItems$Builder addNoLongerSyntheticItems(java.util.Set):85:85 -> a
     4:4:com.android.tools.r8.graph.PrunedItems build():96:96 -> a
     1:2:com.android.tools.r8.graph.PrunedItems$Builder addRemovedClasses(java.util.Set):90:91 -> b
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.P0:
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.U0:
     1:1:void <init>():22:22 -> <init>
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     boolean isIllegalAccessErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -24425,8 +24560,8 @@
     boolean isFailedResolution() -> k
     boolean isSingleResolution() -> l
     boolean isVirtualTarget() -> m
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.P0$a:
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.P0$b:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.U0$a:
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.U0$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
     1:1:void <clinit>():769:769 -> <clinit>
     1:1:void <init>():771:771 -> <init>
@@ -24444,16 +24579,16 @@
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> c
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> d
     boolean isVirtualTarget() -> m
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.P0$c:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.U0$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
     1:1:void <clinit>():833:833 -> <clinit>
     1:1:void <init>():835:835 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.P0$d:
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.U0$d:
     1:1:void <init>():703:703 -> <init>
     1:1:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):703:703 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.P0$e:
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.U0$e:
     1:1:void <init>():794:794 -> <init>
     void forEachFailureDependency(java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -24472,13 +24607,13 @@
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> g
     boolean isFailedResolution() -> k
     boolean isVirtualTarget() -> m
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.P0$f:
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.U0$f:
     java.util.Collection methodsCausingError -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):840:840 -> <init>
     2:3:void <init>(java.util.Collection):844:845 -> <init>
     1:1:void forEachFailureDependency(java.util.function.Consumer):850:850 -> a
     1:1:boolean hasMethodsCausingError():855:855 -> n
-com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.P0$g:
+com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.U0$g:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():889:889 -> <clinit>
@@ -24490,17 +24625,17 @@
     22:22:void lambda$verifyInvalidSymbolicReference$1(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):942:942 -> a
     1:10:boolean isNoSuchMethodErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):925:934 -> b
     1:7:boolean verifyInvalidSymbolicReference():939:945 -> o
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.P0$h:
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.U0$h:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> b
     1:2:void <clinit>():860:861 -> <clinit>
     1:1:void <init>(java.util.Collection):864:864 -> <init>
     1:3:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):868:870 -> a
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.P0$i:
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.U0$i:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
     1:1:void <clinit>():881:881 -> <clinit>
     1:1:void <init>():879:879 -> <init>
     boolean isNoSuchMethodErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.P0$j:
+com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.U0$j:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> b
     com.android.tools.r8.graph.DexEncodedMethod resolvedMethod -> c
@@ -24561,7 +24696,7 @@
     231:243:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):598:610 -> a
     244:244:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):654:654 -> a
     244:244:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):612 -> a
-    245:245:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):510:510 -> a
+    245:245:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):514:514 -> a
     245:245:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):654 -> a
     245:245:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):612 -> a
     246:248:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):655:657 -> a
@@ -24569,7 +24704,7 @@
     249:250:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):613:614 -> a
     251:257:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):665:671 -> a
     251:257:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):614 -> a
-    258:258:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):510:510 -> a
+    258:258:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):514:514 -> a
     258:258:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):671 -> a
     258:258:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):614 -> a
     259:261:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):673:675 -> a
@@ -24597,7 +24732,7 @@
     1:1:boolean isVirtualTarget():229:229 -> m
     1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():177:177 -> n
     1:2:com.android.tools.r8.graph.ProgramMethod getResolvedProgramMethod():181:182 -> o
-com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.Q0:
+com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.V0:
     java.util.List extraParameters -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription NONE -> d
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection argumentInfoCollection -> b
@@ -24645,10 +24780,10 @@
     2:2:int numberOfExtraParameters():396:396 -> h
     2:2:boolean requiresRewritingAtCallSite():414 -> h
     3:4:boolean requiresRewritingAtCallSite():414:415 -> h
-com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.Q0$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.V0$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():31:31 -> <clinit>
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.Q0$b:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.V0$b:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo NO_INFO -> a
     1:16:void <clinit>():26:41 -> <clinit>
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo) -> a
@@ -24657,7 +24792,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo lambda$static$0(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):43:43 -> b
     boolean isRewrittenTypeInfo() -> c
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.Q0$c:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.V0$c:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection EMPTY -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> a
     boolean $assertionsDisabled -> c
@@ -24690,7 +24825,7 @@
     1:2:boolean hasRemovedArguments():205:206 -> d
     1:1:boolean isEmpty():201:201 -> e
     1:2:int numberOfRemovedArguments():215:216 -> f
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.Q0$c$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.V0$c$a:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> a
     1:1:void <clinit>():231:231 -> <clinit>
@@ -24698,7 +24833,7 @@
     1:5:void addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):236:240 -> a
     6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():244:247 -> a
     10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():245:245 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.Q0$d:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.V0$d:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -24712,7 +24847,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():103:103 -> f
     1:1:boolean isAlwaysNull():107:107 -> g
     1:1:boolean isNeverUsed():111:111 -> h
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.Q0$d$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.V0$d$a:
     com.android.tools.r8.graph.DexType type -> b
     boolean isAlwaysNull -> a
     boolean $assertionsDisabled -> c
@@ -24721,7 +24856,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):80:80 -> a
     2:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():85:86 -> a
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():75:75 -> b
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.Q0$e:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.V0$e:
     com.android.tools.r8.graph.DexType newType -> c
     com.android.tools.r8.graph.DexType oldType -> b
     boolean $assertionsDisabled -> d
@@ -24735,7 +24870,7 @@
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
     1:1:com.android.tools.r8.graph.DexType getNewType():146:146 -> e
     1:1:com.android.tools.r8.graph.DexType getOldType():150:150 -> f
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.R0:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.W0:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
     1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):26:35 -> a
@@ -24744,17 +24879,17 @@
     19:21:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):71:73 -> a
     1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):64:66 -> b
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):45:57 -> c
-com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.sC:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.SC:
     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.tC:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.TC:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:4:com.android.tools.r8.graph.SortedProgramPackageCollection createWithAllProgramClasses(com.android.tools.r8.graph.AppView):16:19 -> a
     5:7:boolean addProgramClass(com.android.tools.r8.graph.DexProgramClass):26:28 -> a
-com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.iE:
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.KE:
     java.util.Map typeInfo -> b
     java.util.Map subtypeMap -> c
     java.util.Set NO_DIRECT_SUBTYPE -> d
@@ -24793,7 +24928,7 @@
     1:1:boolean lambda$allImmediateImplementsSubtypes$3(com.android.tools.r8.graph.DexType):219:219 -> h
     1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):60:60 -> i
     1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):166:168 -> j
-com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.iE$a:
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.KE$a:
     java.util.Set directSubtypes -> c
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
@@ -24811,12 +24946,12 @@
     1:5:boolean equals(java.lang.Object):246:250 -> equals
     1:1:int hashCode():241:241 -> hashCode
     1:1:java.lang.String toString():255:255 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.jE:
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.LE:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getResolvedMember() -> b
     com.android.tools.r8.graph.DexClassAndMember getResolutionPair() -> c
     com.android.tools.r8.graph.DexClass getResolvedHolder() -> d
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.SE:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.uF:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):23:23 -> a
     2:2:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:60 -> a
@@ -24851,7 +24986,7 @@
     68:68:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
     69:69:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):88:88 -> a
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
-com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.S0:
+com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.X0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map programClassCache -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -24869,7 +25004,7 @@
     22:22:java.util.List fixupClasses(java.util.Collection):88:88 -> a
     23:26:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):96:99 -> a
     23:26:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
-    27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     27:27:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):100 -> a
     27:27:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
     28:29:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):101:102 -> a
@@ -24918,14 +25053,14 @@
     78:91:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
     92:92:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120:120 -> a
     92:92:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
-    93:93:void com.android.tools.r8.graph.DexClass.setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237:237 -> a
+    93:93:void com.android.tools.r8.graph.DexClass.setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):241:241 -> a
     93:93:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):119 -> a
     93:93:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
     94:95:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):125:126 -> a
     94:95:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
     96:96:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):124:124 -> a
     96:96:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
-    97:97:void com.android.tools.r8.graph.DexClass.setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):257:257 -> a
+    97:97:void com.android.tools.r8.graph.DexClass.setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):261:261 -> a
     97:97:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):123 -> a
     97:97:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):89 -> a
     98:108:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):128:138 -> a
@@ -24953,7 +25088,7 @@
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
     1:3:void lambda$recordFailedResolutionChanges$0(com.android.tools.r8.graph.DexField):62:64 -> b
     4:6:void lambda$recordFailedResolutionChanges$1(com.android.tools.r8.graph.DexMethod):71:73 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.T0:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.Y0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -24995,12 +25130,12 @@
     1:1:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):59:59 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):65:65 -> h
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.T0$a:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.Y0$a:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     1:2:void <clinit>():14:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.i6:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.j6:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     com.android.tools.r8.graph.DexString kotlinAssertionsEnabled -> c
     java.util.List jacocoInstructionSequence -> f
@@ -25076,7 +25211,7 @@
     92:101:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):160:169 -> a
     92:101:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):46 -> a
     102:102:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):47:47 -> a
-com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.V9:
+com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.W9:
     java.util.Map synthesizedWrappers -> b
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
@@ -25094,7 +25229,7 @@
     1:1:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):58 -> d
     1:1:void com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis.traceInvoke(com.android.tools.r8.graph.DexMethod):38:38 -> e
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):63 -> e
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.qb:
     1:1:void <init>():15:15 -> <init>
     void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing) -> a
@@ -25102,10 +25237,10 @@
     void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition) -> a
-com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.qb:
-com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.rb:
-com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.sb:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.sb:
+com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.tb:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.ig:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
@@ -25113,8 +25248,8 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):67:83 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
     19:19:void done(com.android.tools.r8.shaking.Enqueuer):89:89 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.Mf:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Nf$a:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.hg:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.ig$a:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -25122,10 +25257,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):20:20 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):26:28 -> <init>
     1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):33:50 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.Fq:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.dr:
     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.Gq:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.er:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -25133,7 +25268,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.FG:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.bH:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -25150,7 +25285,7 @@
     1:1:java.util.Collection com.android.tools.r8.graph.classmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):39:39 -> e
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):61 -> e
     2:2:boolean isMergeTarget(com.android.tools.r8.graph.DexType):61:61 -> e
-com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode -> com.android.tools.r8.internal.q6:
     java.util.List staticClassInitializers -> a
     int maxStack -> b
     int maxLocals -> c
@@ -25167,15 +25302,15 @@
     2:4:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.CfVersionUtils.max(java.util.List):16:18 -> b
     2:4:com.android.tools.r8.cf.CfVersion getCfVersion():86 -> b
     1:1:boolean isEmpty():33:33 -> c
-com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$1 -> com.android.tools.r8.internal.n6:
-com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$Builder -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$1 -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$Builder -> com.android.tools.r8.internal.p6:
     java.util.List staticClassInitializers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():89:89 -> <clinit>
     1:2:void <init>():89:90 -> <init>
     1:4:void add(com.android.tools.r8.graph.DexEncodedMethod):93:96 -> a
     5:5:com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode build():100:100 -> a
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.x6:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.y6:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map fieldMappings -> d
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> b
@@ -25191,20 +25326,20 @@
     45:47:java.util.Map getAvailableFieldsByRelaxedInfo(java.util.Map):104:106 -> a
     48:50:void lambda$getAvailableFieldsByRelaxedInfo$4(java.util.Map,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):109:109 -> a
     53:53:void lambda$getAvailableFieldsByRelaxedInfo$4(java.util.Map,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):112:112 -> a
-    54:54:void lambda$merge$7(java.util.List,com.android.tools.r8.graph.DexEncodedField,java.util.List):135:135 -> a
-    55:64:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):141:150 -> a
+    54:54:void lambda$merge$7(java.util.List,com.android.tools.r8.graph.DexEncodedField,java.util.List):136:136 -> a
+    55:64:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):142:151 -> a
     65:65:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):204:204 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):150 -> a
-    66:74:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):147:155 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):151 -> a
+    66:74:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):148:156 -> a
     75:75:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):32:32 -> a
-    75:75:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):157 -> a
+    75:75:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):158 -> a
     76:76:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
     76:76:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):32 -> a
-    76:76:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):157 -> a
-    77:77:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):157:157 -> a
-    78:81:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):156:159 -> a
-    82:82:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):155:155 -> a
-    83:83:boolean lambda$mergeSourceFieldsToTargetField$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):145:145 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):158 -> a
+    77:77:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):158:158 -> a
+    78:81:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):157:160 -> a
+    82:82:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.List):156:156 -> a
+    83:83:boolean lambda$mergeSourceFieldsToTargetField$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):146:146 -> a
     84:84:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():235:235 -> a
     84:84:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):117 -> a
     85:86:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):117:118 -> a
@@ -25214,13 +25349,13 @@
     90:90:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():235:235 -> a
     90:90:boolean lambda$fixAccessFlags$5(com.android.tools.r8.graph.DexEncodedField):117 -> a
     1:1:java.util.LinkedList lambda$getAvailableFieldsByRelaxedInfo$3(com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo):111:111 -> b
-    2:8:com.android.tools.r8.graph.DexEncodedField[] merge():130:136 -> b
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():209:209 -> b
-    9:9:boolean lambda$fixAccessFlags$6(com.android.tools.r8.graph.DexEncodedField):120 -> b
+    2:9:com.android.tools.r8.graph.DexEncodedField[] merge():130:137 -> b
+    10:10:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():209:209 -> b
+    10:10:boolean lambda$fixAccessFlags$6(com.android.tools.r8.graph.DexEncodedField):120 -> b
     1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexEncodedField):42:42 -> c
     1:1:void lambda$new$1(com.android.tools.r8.graph.DexEncodedField):42:42 -> d
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):126:126 -> e
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.G6:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> f
@@ -25234,115 +25369,126 @@
     com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger classStaticFieldsMerger -> h
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> g
-    1:5:void <clinit>():55:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode,com.android.tools.r8.horizontalclassmerging.ClassMerger$1):55:55 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode):80:80 -> <init>
-    3:28:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode):67:92 -> <init>
-    1:2:void buildClassIdentifierMap():96:97 -> a
-    3:3:void lambda$buildClassIdentifierMap$0(com.android.tools.r8.graph.DexProgramClass):97:97 -> a
-    4:8:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):141:145 -> a
-    9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2153:2153 -> a
-    9:9:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):145 -> a
-    10:21:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):143:154 -> a
-    22:22:void mergeConstructors(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):178:178 -> a
-    23:23:void lambda$mergeConstructors$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.ConstructorMerger):180:180 -> a
-    24:24:void lambda$mergeVirtualMethods$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):189:189 -> a
-    25:25:void lambda$mergeInterfaces$6(java.util.Set,com.android.tools.r8.graph.DexProgramClass):247:247 -> a
-    1:5:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():108:112 -> b
-    1:5:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):101 -> b
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2153:2153 -> b
-    6:6:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():112 -> b
-    6:6:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):101 -> b
-    7:19:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():114:126 -> b
-    7:19:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):101 -> b
+    1:5:void <clinit>():56:60 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode,com.android.tools.r8.horizontalclassmerging.ClassMerger$1):56:56 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode):81:81 -> <init>
+    3:28:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode):68:93 -> <init>
+    1:2:void buildClassIdentifierMap():97:98 -> a
+    3:3:void lambda$buildClassIdentifierMap$0(com.android.tools.r8.graph.DexProgramClass):98:98 -> a
+    4:8:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):142:146 -> a
+    9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2179:2179 -> a
+    9:9:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):146 -> a
+    10:21:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):144:155 -> a
+    22:22:void mergeConstructors(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):179:179 -> a
+    23:23:void lambda$mergeConstructors$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.ConstructorMerger):181:181 -> a
+    24:24:void lambda$mergeVirtualMethods$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):190:190 -> a
+    25:25:void lambda$mergeInterfaces$6(java.util.Set,com.android.tools.r8.graph.DexProgramClass):250:250 -> a
+    1:5:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():109:113 -> b
+    1:5:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2179:2179 -> b
+    6:6:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():113 -> b
+    6:6:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
+    7:19:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():115:127 -> b
+    7:19:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
     20:20:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> b
-    20:20:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():126 -> b
-    20:20:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):101 -> b
-    21:39:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():116:134 -> b
-    21:39:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):101 -> b
-    40:42:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102:104 -> b
-    43:48:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):168:173 -> b
-    49:49:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):169:169 -> b
-    50:54:void fixAccessFlags():226:230 -> b
-    55:56:void lambda$mergeInstanceFields$7(com.android.tools.r8.graph.DexProgramClass):256:257 -> b
-    1:1:void lambda$mergeStaticFields$5(com.android.tools.r8.graph.DexProgramClass):222:222 -> c
-    2:5:void mergeAnnotations():235:238 -> c
-    6:6:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):263:263 -> c
-    7:9:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():196:198 -> c
-    7:9:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):264 -> c
-    10:10:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():67:67 -> c
-    10:10:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():199 -> c
-    10:10:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):264 -> c
-    11:27:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():200:216 -> c
-    11:27:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):264 -> c
-    28:36:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):266:274 -> c
-    1:1:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):190:190 -> d
-    2:7:void mergeInstanceFields():254:259 -> d
-    1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):139:139 -> e
+    20:20:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():127 -> b
+    20:20:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
+    21:39:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers():117:135 -> b
+    21:39:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):102 -> b
+    40:42:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):103:105 -> b
+    43:48:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):169:174 -> b
+    49:49:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):170:170 -> b
+    50:54:void fixAccessFlags():229:233 -> b
+    55:56:void lambda$mergeInstanceFields$7(com.android.tools.r8.graph.DexProgramClass):259:260 -> b
+    1:1:void lambda$mergeStaticFields$5(com.android.tools.r8.graph.DexProgramClass):225:225 -> c
+    2:5:void mergeAnnotations():238:241 -> c
+    6:8:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):266:268 -> c
+    9:9:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():195:195 -> c
+    9:9:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):269 -> c
+    10:10:boolean com.android.tools.r8.graph.AppView.hasLiveness():579:579 -> c
+    10:10:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():195 -> c
+    10:10:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):269 -> c
+    11:17:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():195:201 -> c
+    11:17:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):269 -> c
+    18:18:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():67:67 -> c
+    18:18:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():202 -> c
+    18:18:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):269 -> c
+    19:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():203:219 -> c
+    19:35:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):269 -> c
+    36:44:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):272:280 -> c
+    1:1:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):191:191 -> d
+    2:7:void mergeInstanceFields():257:262 -> d
+    1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):140:140 -> e
     2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):186:186 -> e
-    2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):139 -> e
-    3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):159:159 -> e
-    4:4:void mergeInterfaces():245:245 -> e
+    2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):140 -> e
+    3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):160:160 -> e
+    4:4:void mergeInterfaces():248:248 -> e
     5:6:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet(java.lang.Iterable):382:383 -> e
-    5:6:void mergeInterfaces():246 -> e
+    5:6:void mergeInterfaces():249 -> e
     7:7:java.util.Collection com.android.tools.r8.com.google.common.collect.Collections2.cast(java.lang.Iterable):377:377 -> e
     7:7:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet(java.lang.Iterable):383 -> e
-    7:7:void mergeInterfaces():246 -> e
+    7:7:void mergeInterfaces():249 -> e
     8:8:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet(java.lang.Iterable):383:383 -> e
-    8:8:void mergeInterfaces():246 -> e
+    8:8:void mergeInterfaces():249 -> e
     9:9:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> e
     9:9:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet(java.lang.Iterable):385 -> e
-    9:9:void mergeInterfaces():246 -> e
+    9:9:void mergeInterfaces():249 -> e
     10:10:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet(java.lang.Iterable):386:386 -> e
-    10:10:void mergeInterfaces():246 -> e
-    11:13:void mergeInterfaces():247:249 -> e
+    10:10:void mergeInterfaces():249 -> e
+    11:13:void mergeInterfaces():250:252 -> e
     14:14:void com.android.tools.r8.graph.DexTypeList.<init>(java.util.Collection):46:46 -> e
-    14:14:void mergeInterfaces():249 -> e
+    14:14:void mergeInterfaces():252 -> e
     15:15:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):173:173 -> e
-    15:15:void mergeInterfaces():249 -> e
-    1:3:void mergeStaticFields():220:222 -> f
-    1:3:void mergeVirtualMethods():188:190 -> g
-com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.D6:
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.E6:
+    15:15:void mergeInterfaces():252 -> e
+    1:3:void mergeStaticFields():223:225 -> f
+    1:3:void mergeVirtualMethods():189:191 -> g
+com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.E6:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.F6:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$Builder classInitializerSynthesizedCodeBuilder -> c
-    java.util.Map constructorMergerBuilders -> d
-    java.util.List unmergedConstructorBuilders -> e
-    boolean $assertionsDisabled -> g
-    java.util.Map virtualMethodMergerBuilders -> f
-    1:1:void <clinit>():277:277 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):288:288 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):280:290 -> <init>
-    1:3:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder setup():294:296 -> a
-    4:5:java.lang.Object com.android.tools.r8.utils.IterableUtils.findOrDefault(java.lang.Iterable,java.util.function.Predicate,java.lang.Object):46:47 -> a
-    4:5:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder setup():296 -> a
-    6:10:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder setup():296:300 -> a
-    11:11:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder setup():299:299 -> a
-    12:17:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder setup():298:303 -> a
-    18:23:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):308:313 -> a
-    24:24:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):206:206 -> a
-    24:24:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):313 -> a
-    25:26:void addConstructor(com.android.tools.r8.graph.ProgramMethod):317:318 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isConstructorMergingEnabled():1201:1201 -> a
-    27:27:void addConstructor(com.android.tools.r8.graph.ProgramMethod):318 -> a
-    28:30:void addConstructor(com.android.tools.r8.graph.ProgramMethod):319:321 -> a
-    31:36:void addConstructor(com.android.tools.r8.graph.ProgramMethod):320:325 -> a
-    37:37:void addConstructor(com.android.tools.r8.graph.ProgramMethod):324:324 -> a
-    38:38:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$addConstructor$0(com.android.tools.r8.graph.DexProto):321:321 -> a
-    39:39:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$addVirtualMethod$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):334:334 -> a
-    40:51:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):346:357 -> a
-    52:52:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():339:339 -> a
-    52:52:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):358 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isConstructorMergingEnabled():1201:1201 -> a
-    53:53:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():339 -> a
-    53:53:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):358 -> a
-    54:55:java.util.Collection com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.getConstructorMergerBuilders():340:341 -> a
-    54:55:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):358 -> a
-    56:71:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):358:373 -> a
-    1:4:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):330:333 -> b
-    5:8:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):332:335 -> b
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.G6:
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):287:289 -> <init>
+    1:9:com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode createClassInitializerMerger():315:323 -> a
+    10:11:void lambda$createClassInitializerMerger$0(com.android.tools.r8.horizontalclassmerging.ClassInitializerSynthesizedCode$Builder,com.android.tools.r8.graph.DexProgramClass):319:320 -> a
+    12:12:void lambda$createInstanceInitializerMergers$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass):332:332 -> a
+    13:13:void lambda$createInstanceInitializerMergers$2(java.util.Map,com.android.tools.r8.graph.ProgramMethod):337:337 -> a
+    14:17:void lambda$createInstanceInitializerMergers$2(java.util.Map,com.android.tools.r8.graph.ProgramMethod):336:339 -> a
+    18:18:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$createInstanceInitializerMergers$1(com.android.tools.r8.graph.DexProto):338:338 -> a
+    19:19:void lambda$createInstanceInitializerMergers$5(java.util.List,com.android.tools.r8.graph.DexProgramClass):346:346 -> a
+    20:24:void lambda$createInstanceInitializerMergers$4(java.util.List,com.android.tools.r8.graph.ProgramMethod):349:349 -> a
+    25:25:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$createVirtualMethodMergers$6(com.android.tools.r8.graph.DexMethodSignature):371:371 -> a
+    26:32:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):391:397 -> a
+    33:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():383:386 -> a
+    33:36:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):399 -> a
+    37:37:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():385:385 -> a
+    37:37:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):399 -> a
+    38:38:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():384:384 -> a
+    38:38:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):399 -> a
+    39:45:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):402:408 -> a
+    46:46:boolean lambda$build$9(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):397:397 -> a
+    1:2:java.util.List createInstanceInitializerMergers():327:328 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isConstructorMergingEnabled():1204:1204 -> b
+    3:3:java.util.List createInstanceInitializerMergers():328 -> b
+    4:32:java.util.List createInstanceInitializerMergers():329:357 -> b
+    33:33:void lambda$createVirtualMethodMergers$8(java.util.Map,com.android.tools.r8.graph.DexProgramClass):366:366 -> b
+    34:34:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):206:206 -> b
+    34:34:void lambda$createVirtualMethodMergers$8(java.util.Map,com.android.tools.r8.graph.DexProgramClass):366 -> b
+    35:35:void lambda$createVirtualMethodMergers$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):370:370 -> b
+    36:39:void lambda$createVirtualMethodMergers$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):369:372 -> b
+    1:15:java.util.List createVirtualMethodMergers():362:376 -> c
+    1:1:void selectTarget():293:293 -> d
+    2:2:boolean com.android.tools.r8.utils.IterableUtils.isEmpty(java.lang.Iterable):96:96 -> d
+    2:2:void selectTarget():294 -> d
+    3:5:void selectTarget():295:297 -> d
+    6:6:java.lang.Object com.android.tools.r8.utils.IterableUtils.first(java.lang.Iterable):55:55 -> d
+    6:6:void selectTarget():298 -> d
+    7:16:void selectTarget():298:307 -> d
+    17:17:int com.android.tools.r8.graph.DexString.size():44:44 -> d
+    17:17:void selectTarget():307 -> d
+    18:22:void selectTarget():307:311 -> d
+    23:23:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():463:463 -> d
+    23:23:void selectTarget():311 -> d
+    24:24:void selectTarget():311:311 -> d
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.H6:
     java.util.List virtualMethods -> b
     java.util.List directMethods -> c
     java.util.Set reservedMethods -> a
@@ -25355,7 +25501,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.c7:
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.d7:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     java.util.Map targetFields -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -25368,26 +25514,29 @@
     15:15:void addFields(com.android.tools.r8.graph.DexProgramClass):55:55 -> a
     1:1:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):31:31 -> b
     2:2:void merge(com.android.tools.r8.graph.DexProgramClass):59:59 -> b
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.Q8:
+    boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.DexField classIdField -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> n
+    1:1:void <clinit>():36:36 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod):46:49 -> <init>
-    1:1:void addConstructorInvoke(com.android.tools.r8.graph.DexMethod):53:53 -> a
-    2:10:void lambda$addConstructorInvoke$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):55:63 -> a
-    11:11:void lambda$prepareMultiConstructorInstructions$3(int,int[],com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):92:92 -> a
-    12:12:boolean lambda$prepareMultiConstructorInstructions$4(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):93:93 -> a
+    1:1:void addConstructorInvoke(com.android.tools.r8.graph.DexMethod):57:57 -> a
+    2:10:void lambda$addConstructorInvoke$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):59:67 -> a
+    11:11:void lambda$prepareMultiConstructorInstructions$3(int,int[],com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):100:100 -> a
+    12:12:boolean lambda$prepareMultiConstructorInstructions$4(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):101:101 -> a
     13:16:boolean com.android.tools.r8.ir.synthetic.SyntheticSourceCode.endsSwitch(com.android.tools.r8.ir.conversion.IRBuilder,int,int,int[]):231:234 -> a
-    13:16:boolean lambda$prepareMultiConstructorInstructions$4(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):93 -> a
-    1:1:void lambda$addRegisterClassIdAssignment$1(int,com.android.tools.r8.ir.conversion.IRBuilder):69:69 -> b
-    2:2:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):75:75 -> b
+    13:16:boolean lambda$prepareMultiConstructorInstructions$4(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
+    1:1:void lambda$addRegisterClassIdAssignment$1(int,com.android.tools.r8.ir.conversion.IRBuilder):74:74 -> b
+    2:2:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):81:81 -> b
     3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addIntConst(int,long):1225:1225 -> b
-    3:3:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):75 -> b
-    1:3:void addConstantRegisterClassIdAssignment(int):74:76 -> i
-    4:7:void prepareInstructions():125:128 -> i
-    1:1:void addRegisterClassIdAssignment(int):69:69 -> j
-    2:32:void prepareMultiConstructorInstructions():80:110 -> j
-    1:4:void prepareSingleConstructorInstructions():117:120 -> k
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.Q8:
+    3:3:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):81 -> b
+    1:4:void addConstantRegisterClassIdAssignment(int):79:82 -> i
+    5:8:void prepareInstructions():135:138 -> i
+    1:1:boolean hasClassIdField():53:53 -> j
+    2:3:void addRegisterClassIdAssignment(int):73:74 -> j
+    1:33:void prepareMultiConstructorInstructions():86:118 -> k
+    1:6:void prepareSingleConstructorInstructions():125:130 -> l
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.R8:
     com.android.tools.r8.graph.DexField classIdField -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> f
     com.android.tools.r8.graph.DexMethod originalMethod -> d
@@ -25397,7 +25546,7 @@
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():33:33 -> Q
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):34:34 -> a
     2:3:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):44:45 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.T8:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     java.util.Collection constructors -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -25406,84 +25555,84 @@
     1:1:void <clinit>():34:34 -> <clinit>
     1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection):41:50 -> <init>
     1:1:int getArity():66:66 -> a
-    2:7:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):112:117 -> a
-    8:21:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):113:126 -> a
-    22:34:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):144:156 -> a
-    35:35:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):155:155 -> a
+    2:7:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):111:116 -> a
+    8:21:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):112:125 -> a
+    22:34:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):143:155 -> a
+    35:35:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):154:154 -> a
     36:36:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():58:58 -> a
-    36:36:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
-    37:37:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():107:107 -> a
+    36:36:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):158 -> a
+    37:37:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():106:106 -> a
     37:37:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():59 -> a
-    37:37:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
+    37:37:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):158 -> a
     38:38:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():60:60 -> a
-    38:38:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
-    39:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.appendTypeToMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2358:2359 -> a
+    38:38:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):158 -> a
+    39:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.appendTypeToMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2384:2385 -> a
     39:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():60 -> a
-    39:40:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159 -> a
-    41:44:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):160:163 -> a
-    45:65:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):161:181 -> a
-    66:79:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):177:190 -> a
-    80:80:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():133:133 -> a
-    80:80:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):193 -> a
-    81:83:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):194:196 -> a
+    39:40:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):158 -> a
+    41:44:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):159:162 -> a
+    45:65:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):160:180 -> a
+    66:79:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):176:189 -> a
+    80:80:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():132:132 -> a
+    80:80:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):192 -> a
+    81:83:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):193:195 -> a
     84:84:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
-    84:84:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):196 -> a
-    85:93:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):202:210 -> a
-    94:101:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):209:216 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.R8:
+    84:84:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):195 -> a
+    85:93:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):201:209 -> a
+    94:101:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):208:215 -> a
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.S8:
     java.util.List constructorGroups -> b
     com.android.tools.r8.graph.AppView appView -> c
     int estimatedDexCodeSize -> a
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():69:69 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):74:74 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
-    1:2:void createNewGroup():81:82 -> a
-    3:6:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):86:89 -> a
-    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():285:285 -> a
-    7:7:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):89 -> a
-    8:8:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> a
-    9:10:void com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder.createNewGroup():81:82 -> a
-    9:10:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):91 -> a
-    11:12:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):94:95 -> a
-    13:14:java.util.List build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):100:101 -> a
-    15:15:com.android.tools.r8.horizontalclassmerging.ConstructorMerger lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):102:102 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.pe:
+    2:7:void <init>(com.android.tools.r8.graph.AppView):71:76 -> <init>
+    1:2:void createNewGroup():80:81 -> a
+    3:6:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):85:88 -> a
+    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():288:288 -> a
+    7:7:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):88 -> a
+    8:8:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
+    9:10:void com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder.createNewGroup():80:81 -> a
+    9:10:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):90 -> a
+    11:12:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):93:94 -> a
+    13:14:java.util.List build(com.android.tools.r8.horizontalclassmerging.MergeGroup):99:100 -> a
+    15:15:com.android.tools.r8.horizontalclassmerging.ConstructorMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):101:101 -> a
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Ke:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):54:56 -> <init>
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):60:60 -> a
+    1:1:void <clinit>():51:51 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView):65:67 -> <init>
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):71:71 -> a
     2:3:void com.android.tools.r8.horizontalclassmerging.MergeGroup.<init>(java.util.Collection):39:40 -> a
-    2:3:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):60 -> a
-    4:41:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.getPolicies(com.android.tools.r8.shaking.RuntimeTypeCheckInfo):113:150 -> a
-    4:41:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):63 -> a
-    42:47:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):64:69 -> a
-    48:48:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.empty():32:32 -> a
-    48:48:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):69 -> a
-    49:53:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):69:73 -> a
-    54:60:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):160:166 -> a
-    54:60:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):77 -> a
-    61:62:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):78:79 -> a
-    63:64:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):175:176 -> a
-    63:64:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):80 -> a
-    65:65:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):84:84 -> a
-    66:66:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.builder():28:28 -> a
-    66:66:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):84 -> a
-    67:68:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):84:85 -> a
-    69:70:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):188:189 -> a
-    69:70:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):87 -> a
-    71:72:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):90:91 -> a
-    73:73:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):444:444 -> a
-    73:73:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):91 -> a
-    74:74:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):93:93 -> a
-    75:75:void lambda$run$0(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):91:91 -> a
-    76:87:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier createFieldAccessInfoCollectionModifier(java.util.Collection):98:109 -> a
-    88:88:boolean lambda$createFieldAccessInfoCollectionModifier$1(com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
-    89:89:void lambda$createFieldAccessInfoCollectionModifier$2(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
-    1:1:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):106:106 -> b
-    2:2:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):107:107 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.se:
+    2:3:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):71 -> a
+    4:43:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.getPolicies(com.android.tools.r8.shaking.RuntimeTypeCheckInfo):130:169 -> a
+    4:43:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):74 -> a
+    44:49:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):75:80 -> a
+    50:50:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.empty():32:32 -> a
+    50:50:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):80 -> a
+    51:55:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):80:84 -> a
+    56:62:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):179:185 -> a
+    56:62:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):88 -> a
+    63:63:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):91:91 -> a
+    64:65:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):194:195 -> a
+    64:65:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):93 -> a
+    66:66:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):97:97 -> a
+    67:67:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.builder():28:28 -> a
+    67:67:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):97 -> a
+    68:69:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):97:98 -> a
+    70:71:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):207:208 -> a
+    70:71:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):100 -> a
+    72:74:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):103:105 -> a
+    75:75:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):444:444 -> a
+    75:75:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):105 -> a
+    76:76:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.utils.Timing):107:107 -> a
+    77:77:void lambda$run$0(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):105:105 -> a
+    78:92:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier createFieldAccessInfoCollectionModifier(java.util.Collection):112:126 -> a
+    93:93:boolean lambda$createFieldAccessInfoCollectionModifier$1(com.android.tools.r8.graph.DexEncodedMethod):118:118 -> a
+    94:94:void lambda$createFieldAccessInfoCollectionModifier$2(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
+    1:1:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):122:122 -> b
+    2:2:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):123:123 -> b
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Ne:
     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):26:26 -> <init>
@@ -25501,13 +25650,13 @@
     15:15:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):78:78 -> b
     16:20:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):76:80 -> b
     1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):45:45 -> g
-    2:2:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):100:100 -> g
+    2:2:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):104:104 -> g
     2:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):45 -> g
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> g
-    3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):100 -> g
+    3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):104 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):45 -> g
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.qe:
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.re:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Me:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap newMethodSignatures -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> a
     java.util.Map methodExtraParameters -> d
@@ -25544,17 +25693,17 @@
     3:3:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):157:157 -> c
     3:3:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):153 -> c
     1:1:void recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):157:157 -> d
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult -> com.android.tools.r8.internal.te:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerResult -> com.android.tools.r8.internal.Oe:
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier fieldAccessInfoCollectionModifier -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens graphLens -> b
     1:3:void <init>(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):16:18 -> <init>
     1:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier getFieldAccessInfoCollectionModifier():22:22 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens getGraphLens():26:26 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.Pe:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:6:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):14:19 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.ve:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Qe:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -25570,14 +25719,14 @@
     1:1:java.util.Set getTargets():53:53 -> d
     2:2:boolean hasBeenMergedOrIsMergeTarget(com.android.tools.r8.graph.DexType):67:67 -> d
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):63:63 -> e
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.ve$a:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.Qe$a:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> a
     1:4:void <init>():85:88 -> <init>
     1:1:void addMergeGroup(com.android.tools.r8.horizontalclassmerging.MergeGroup):91:91 -> a
     2:2:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.DexProgramClass):91:91 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder addMergeGroups(java.lang.Iterable):95:95 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses build():100:100 -> a
-com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.Eq:
+com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.cr:
     com.android.tools.r8.graph.DexField classIdField -> b
     com.android.tools.r8.graph.DexProgramClass target -> c
     java.util.LinkedList classes -> a
@@ -25592,42 +25741,40 @@
     4:4:void add(com.android.tools.r8.horizontalclassmerging.MergeGroup):54:54 -> a
     5:5:void addAll(java.util.Collection):58:58 -> a
     6:9:void forEachSource(java.util.function.Consumer):66:69 -> a
-    10:10:com.android.tools.r8.graph.DexField getClassIdField():83:83 -> a
-    11:11:boolean com.android.tools.r8.horizontalclassmerging.MergeGroup.hasClassIdField():79:79 -> a
-    11:11:com.android.tools.r8.graph.DexField getClassIdField():83 -> a
-    12:13:com.android.tools.r8.graph.DexField getClassIdField():83:84 -> a
-    14:14:void setClassIdField(com.android.tools.r8.graph.DexField):88:88 -> a
+    10:11:com.android.tools.r8.graph.DexField getClassIdField():83:84 -> a
+    12:12:void setClassIdField(com.android.tools.r8.graph.DexField):88:88 -> a
     1:1:java.util.LinkedList getClasses():75:75 -> b
     2:2:boolean lambda$getSources$0(com.android.tools.r8.graph.DexProgramClass):93:93 -> b
     1:2:java.lang.Iterable getSources():92:93 -> c
     3:4:void setTarget(com.android.tools.r8.graph.DexProgramClass):105:106 -> c
     1:1:com.android.tools.r8.graph.DexProgramClass getTarget():101:101 -> d
-    1:1:boolean hasTarget():97:97 -> e
-    1:1:int com.android.tools.r8.horizontalclassmerging.MergeGroup.size():123:123 -> f
-    1:1:boolean isTrivial():110 -> f
-    1:1:com.android.tools.r8.graph.DexProgramClass removeLast():135:135 -> g
+    1:1:boolean hasClassIdField():79:79 -> e
+    1:1:boolean hasTarget():97:97 -> f
+    1:1:int com.android.tools.r8.horizontalclassmerging.MergeGroup.size():123:123 -> g
+    1:1:boolean isTrivial():110 -> g
+    1:1:com.android.tools.r8.graph.DexProgramClass removeLast():135:135 -> h
     1:1:boolean isEmpty():114:114 -> isEmpty
     1:1:java.util.Iterator iterator():119:119 -> iterator
     1:1:boolean removeIf(java.util.function.Predicate):131:131 -> removeIf
     1:1:int size():123:123 -> size
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.Hr:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.as:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():10:10 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup) -> a
     1:2:java.util.Collection removeTrivialGroups(java.util.Collection):16:17 -> a
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.Ir:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.bs:
     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.Cv:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.Wv:
     int numberOfRemovedClasses -> a
     1:1:void <init>():11:11 -> <init>
     void clear() -> a
     java.lang.String getName() -> b
     boolean shouldSkipPolicy() -> c
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.Dv:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.Xv:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -25640,10 +25787,10 @@
     19:19:void lambda$applyMultiClassPolicy$1(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):42 -> a
     20:47:java.util.Collection run(java.util.Collection,java.util.Collection,com.android.tools.r8.utils.Timing):59:86 -> a
     48:48:boolean lambda$run$3(com.android.tools.r8.horizontalclassmerging.MergeGroup):86:86 -> a
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.WB:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.wC:
     1:1:void <init>():9:9 -> <init>
     boolean canMerge(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.hE:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.JE:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -25665,13 +25812,13 @@
     12:12:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
     1:1:java.util.Collection getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> b
     1:1:java.util.List lambda$calculateSubtyping$0(com.android.tools.r8.graph.DexProgramClass):59:59 -> c
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.BE:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.dF:
     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$1 -> com.android.tools.r8.internal.zE:
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.AE:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.bF:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.cF:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():45:45 -> <clinit>
@@ -25684,61 +25831,61 @@
     10:13:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):62:65 -> a
     14:17:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):64:67 -> a
     18:20:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):66:68 -> a
-com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.aF:
-    com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> g
-    com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> f
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.CF:
+    com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> g
+    com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> h
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> i
     boolean $assertionsDisabled -> l
-    com.android.tools.r8.graph.AppView appView -> h
+    com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass syntheticArgumentClass -> j
     com.android.tools.r8.com.google.common.collect.BiMap reservedInterfaceSignatures -> k
     1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):53:53 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):46:58 -> <init>
-    1:7:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):135:141 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):54:54 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):47:59 -> <init>
+    1:7:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):136:142 -> a
     8:8:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):143 -> a
-    9:19:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):145:155 -> a
-    20:31:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):198:209 -> a
-    32:44:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):214:226 -> a
-    45:59:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):234:248 -> a
-    60:67:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):246:253 -> a
-    68:74:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):251:257 -> a
-    75:89:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):256:270 -> a
-    90:90:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):249:249 -> a
-    91:92:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):299:300 -> a
-    93:106:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.collect.BiMap):276:289 -> a
-    93:106:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):303 -> a
+    8:8:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):144 -> a
+    9:19:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):146:156 -> a
+    20:31:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):199:210 -> a
+    32:44:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):215:227 -> a
+    45:59:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):235:249 -> a
+    60:67:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):247:254 -> a
+    68:74:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):252:258 -> a
+    75:89:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):257:271 -> a
+    90:90:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):250:250 -> a
+    91:92:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):300:301 -> a
+    93:106:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.collect.BiMap):277:290 -> a
+    93:106:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):304 -> a
     107:107:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.TreeFixerBase.fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):340:340 -> a
-    107:107:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    108:131:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):312:335 -> a
-    132:136:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):334:338 -> a
-    137:141:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):319:323 -> a
-    142:169:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):320:347 -> a
-    170:172:boolean lambda$fixupVirtualMethod$5(java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexMethodSignature):325:327 -> a
-    173:188:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):354:369 -> a
-    189:189:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2032:2032 -> a
-    189:189:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):365 -> a
-    190:201:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):365:376 -> a
-    202:202:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367:367 -> a
+    107:107:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):307 -> a
+    108:131:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):313:336 -> a
+    132:136:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):335:339 -> a
+    137:141:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):320:324 -> a
+    142:169:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):321:348 -> a
+    170:172:boolean lambda$fixupVirtualMethod$5(java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexMethodSignature):326:328 -> a
+    173:188:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):355:370 -> a
+    189:189:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2058:2058 -> a
+    189:189:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):366 -> a
+    190:201:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):366:377 -> a
+    202:202:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):368:368 -> a
     203:203:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):200:200 -> a
-    203:203:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367 -> a
-    204:205:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):367:368 -> a
-    206:206:boolean lambda$fixupFields$6(java.util.Set,com.android.tools.r8.graph.DexField):368:368 -> a
-    207:207:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):389:389 -> a
-    208:208:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):395:395 -> a
-    209:209:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):401:401 -> a
-    1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():115:125 -> b
-    12:12:void fixupProgramClassSuperType(com.android.tools.r8.graph.DexProgramClass):130:130 -> b
-    13:13:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):147:147 -> b
-    14:19:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):161:166 -> b
-    20:38:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):165:183 -> b
-    39:51:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):182:194 -> b
-    52:52:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):205:205 -> b
-    53:54:boolean lambda$fixupDirectMethod$4(java.util.Set,com.android.tools.r8.graph.DexMethod):262:263 -> b
-    55:55:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):383:383 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):150:150 -> c
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.HG:
+    203:203:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):368 -> a
+    204:205:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):368:369 -> a
+    206:206:boolean lambda$fixupFields$6(java.util.Set,com.android.tools.r8.graph.DexField):369:369 -> a
+    207:207:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):390:390 -> a
+    208:208:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):396:396 -> a
+    209:209:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):402:402 -> a
+    1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():116:126 -> b
+    12:12:void fixupProgramClassSuperType(com.android.tools.r8.graph.DexProgramClass):131:131 -> b
+    13:13: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):148:148 -> b
+    14:19:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):162:167 -> b
+    20:38:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):166:184 -> b
+    39:51:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):183:195 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):206:206 -> b
+    53:54:boolean lambda$fixupDirectMethod$4(java.util.Set,com.android.tools.r8.graph.DexMethod):263:264 -> b
+    55:55:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):384:384 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):151:151 -> c
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.dH:
     com.android.tools.r8.graph.DexMethod superMethod -> o
     boolean $assertionsDisabled -> p
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> m
@@ -25758,67 +25905,67 @@
     1:5:void handleReturn(int):101:105 -> i
     6:55:void prepareInstructions():111:160 -> i
     1:3:void addInvokeSuper():87:89 -> j
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.IG:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.eH:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> e
     1:6:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):23:28 -> <init>
     boolean isHorizontalClassMergingCode() -> N
     1:1:java.util.function.Consumer getRegistryCallback():33:33 -> P
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:25 -> a
     1:2:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):37:38 -> b
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.KG:
-    com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
-    com.android.tools.r8.graph.AppView appView -> d
-    java.util.List methods -> c
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.gH:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
+    java.util.List methods -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod superMethod -> e
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():32:32 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.graph.DexMethod):43:48 -> <init>
-    1:7:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):99:105 -> a
-    8:22:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):101:115 -> a
-    23:44:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():119:140 -> a
-    45:45:boolean lambda$getAccessFlags$0(com.android.tools.r8.graph.MethodAccessFlags):122:122 -> a
-    46:46:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):154:154 -> a
-    47:81:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):180:214 -> a
-    82:82:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):209:209 -> a
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.graph.DexMethod):44:49 -> <init>
+    1:7:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):102:108 -> a
+    8:22:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):104:118 -> a
+    23:44:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():122:143 -> a
+    45:45:boolean lambda$getAccessFlags$0(com.android.tools.r8.graph.MethodAccessFlags):125:125 -> a
+    46:46:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
+    47:81:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):187:221 -> a
+    82:82:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216:216 -> a
     83:83:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1639:1639 -> a
-    83:83:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):209 -> a
+    83:83:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216 -> a
     84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1632:1632 -> a
     84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1638 -> a
-    84:84:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):209 -> a
-    85:124:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):221:260 -> a
-    125:146:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):256:277 -> a
-    147:147:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
-    147:147:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):277 -> a
-    148:160:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):281:293 -> a
-    161:161:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):225:225 -> a
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getMethodReference():91:91 -> b
-    1:1:int getArity():95 -> b
-    2:2:int getArity():95:95 -> b
-    3:3:boolean lambda$getAccessFlags$1(com.android.tools.r8.graph.MethodAccessFlags):125:125 -> b
-    4:4:boolean lambda$isTrivial$7(com.android.tools.r8.graph.ProgramMethod):170:170 -> b
-    1:1:boolean lambda$getAccessFlags$2(com.android.tools.r8.graph.MethodAccessFlags):128:128 -> c
-    2:2:com.android.tools.r8.graph.DexMethod getNewMethodReference():145:145 -> c
-    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():625:625 -> c
-    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):288 -> c
-    3:3:com.android.tools.r8.graph.DexMethod getNewMethodReference():145 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):292:292 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):288 -> c
-    4:4:com.android.tools.r8.graph.DexMethod getNewMethodReference():145 -> c
-    5:5:boolean lambda$mergeTrivial$8(com.android.tools.r8.graph.ProgramMethod):184:184 -> c
-    1:1:boolean lambda$getAccessFlags$3(com.android.tools.r8.graph.MethodAccessFlags):131:131 -> d
-    2:3:boolean isNop():153:154 -> d
-    1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):134:134 -> e
-    2:9:boolean isTrivial():163:170 -> e
-    1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):137:137 -> f
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.JG:
+    84:84:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216 -> a
+    85:85:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):228:228 -> a
+    86:86:boolean com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.isNopOrTrivial():178:178 -> a
+    86:86:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):231 -> a
+    87:121:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):232:266 -> a
+    122:143:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):262:283 -> a
+    144:144:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
+    144:144:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):283 -> a
+    145:157:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):287:299 -> a
+    1:1:boolean lambda$getAccessFlags$1(com.android.tools.r8.graph.MethodAccessFlags):128:128 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getNewMethodReference():148:148 -> b
+    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():629:629 -> b
+    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):288 -> b
+    3:3:com.android.tools.r8.graph.DexMethod getNewMethodReference():148 -> b
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):292:292 -> b
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):288 -> b
+    4:4:com.android.tools.r8.graph.DexMethod getNewMethodReference():148 -> b
+    5:5:boolean lambda$isTrivial$7(com.android.tools.r8.graph.ProgramMethod):173:173 -> b
+    1:1:boolean lambda$getAccessFlags$2(com.android.tools.r8.graph.MethodAccessFlags):131:131 -> c
+    2:3:boolean isNop():156:157 -> c
+    4:4:boolean lambda$mergeTrivial$8(com.android.tools.r8.graph.ProgramMethod):191:191 -> c
+    1:1:boolean lambda$getAccessFlags$3(com.android.tools.r8.graph.MethodAccessFlags):134:134 -> d
+    2:2:boolean isNopOrTrivial():178:178 -> d
+    1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):137:137 -> e
+    2:9:boolean isTrivial():166:173 -> e
+    1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):140:140 -> f
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.fH:
     java.util.List methods -> a
-    1:2:void <init>():51:52 -> <init>
-    1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):55:55 -> a
-    2:2:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85:85 -> a
-    3:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):61:79 -> a
-    3:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):85 -> a
-    22:22:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):86:86 -> a
+    1:2:void <init>():52:53 -> <init>
+    1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):56:56 -> a
+    2:2:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):88:88 -> a
+    3:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):63:81 -> a
+    3:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):88 -> a
+    22:22:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):89:89 -> a
 com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated -> com.android.tools.r8.internal.X0:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
@@ -25837,7 +25984,7 @@
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification ABSTRACT -> a
     1:2:void <clinit>():17:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.Ma:
+com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.Na:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):51:51 -> a
@@ -25846,7 +25993,7 @@
     4:19:boolean com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy.disallowInlining(com.android.tools.r8.graph.ProgramMethod):26:41 -> a
     4:19:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):52 -> a
     1:1:java.lang.String getName():57:57 -> b
-com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.Na:
+com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.Oa:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):20:21 -> <init>
     1:1:boolean com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
@@ -25854,7 +26001,7 @@
     2:4:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     5:29:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):31:55 -> a
     1:1:java.lang.String getName():62:62 -> b
-com.android.tools.r8.horizontalclassmerging.policies.LimitGroups -> com.android.tools.r8.internal.Qo:
+com.android.tools.r8.horizontalclassmerging.policies.LimitGroups -> com.android.tools.r8.internal.np:
     int maxGroupSize -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -25867,7 +26014,7 @@
     10:11:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):35 -> a
     12:19:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):37:44 -> a
     1:1:java.lang.String getName():58:58 -> b
-com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeFieldCasts -> com.android.tools.r8.internal.Jr:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -25879,30 +26026,36 @@
     40:42:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
     43:43:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63:63 -> a
     1:1:java.lang.String getName():76:76 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.As:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.Ts:
     1:1:void <init>():10:10 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
+    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():18:18 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.Bs:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.Us:
     1:1:void <init>():18:18 -> <init>
     1:4:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):23:26 -> a
     5:6:void com.android.tools.r8.horizontalclassmerging.MergeGroup.<init>(com.android.tools.r8.graph.DexProgramClass):34:35 -> a
     5:6:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):26 -> a
     7:23:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):26:42 -> a
     1:1:java.lang.String getName():47:47 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.Cs:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.Vs:
     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 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.Ds:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.Ws:
+    java.util.Set deadEnumLiteMaps -> b
+    1:4:void <init>(com.android.tools.r8.graph.AppView):20:23 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
+    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
+    1:1:java.lang.String getName():33:33 -> b
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.Xs:
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> b
     1:2:void <init>(com.android.tools.r8.shaking.RuntimeTypeCheckInfo):14:15 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):20:20 -> a
     1:1:java.lang.String getName():25:25 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.Es:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.Ys:
     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>
@@ -25911,47 +26064,64 @@
     2:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):36:39 -> a
     6:18:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):46:58 -> a
     1:1:java.lang.String getName():31:31 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.Fs:
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.Zs:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> e
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> d
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):26:26 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):23:28 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):27:27 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):23:29 -> <init>
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):18:18 -> a
-    2:21:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):43:62 -> a
-    22:22:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):48:48 -> a
-    1:2:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):37:38 -> b
+    2:21:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):44:63 -> a
+    22:22:boolean computeInterfaceHasDirectOrIndirectRuntimeTypeCheck(com.android.tools.r8.graph.DexType):49:49 -> a
+    1:2:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):38:39 -> b
     3:4:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):62:63 -> b
-    3:4:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):38 -> b
+    3:4:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
     5:5:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(com.android.tools.r8.graph.DexType[]):50:50 -> b
     5:5:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.keepIf(java.util.function.Predicate):64 -> b
-    5:5:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):38 -> b
+    5:5:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
     6:12:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():149:155 -> b
-    6:12:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):39 -> b
-    13:13:java.lang.String getName():71:71 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.Gs:
+    6:12:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40 -> b
+    13:13:java.lang.String getName():72:72 -> b
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.at:
     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 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.Hs:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.bt:
     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 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.Is:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.ct:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
     1:1:java.lang.String getName():19:19 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.dt:
+    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> c
     com.android.tools.r8.graph.AppView appView -> b
-    java.util.Set dontMergeTypes -> c
-    1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):20:25 -> <init>
-    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):50:50 -> a
-    1:11:void processClass(com.android.tools.r8.graph.DexProgramClass):29:39 -> b
-    12:12:void processClass(com.android.tools.r8.graph.DexProgramClass):38:38 -> b
-    13:21:void processClass(com.android.tools.r8.graph.DexProgramClass):36:44 -> b
-    22:22:java.lang.String getName():55:55 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.Ks:
+    java.util.Set dontMergeTypes -> d
+    1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):24:29 -> <init>
+    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):52:52 -> a
+    1:2:void processClass(com.android.tools.r8.graph.DexProgramClass):33:34 -> b
+    3:3:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):85:85 -> b
+    3:3:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> b
+    3:3:void processClass(com.android.tools.r8.graph.DexProgramClass):34 -> b
+    4:4:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramClass():37:37 -> b
+    4:4:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):86 -> b
+    4:4:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> b
+    4:4:void processClass(com.android.tools.r8.graph.DexProgramClass):34 -> b
+    5:5:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):86:86 -> b
+    5:5:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> b
+    5:5:void processClass(com.android.tools.r8.graph.DexProgramClass):34 -> b
+    6:6:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):146:146 -> b
+    6:6:void processClass(com.android.tools.r8.graph.DexProgramClass):34 -> b
+    7:9:void processClass(com.android.tools.r8.graph.DexProgramClass):35:37 -> b
+    10:10:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):142:142 -> b
+    10:10:void processClass(com.android.tools.r8.graph.DexProgramClass):37 -> b
+    11:14:void processClass(com.android.tools.r8.graph.DexProgramClass):39:42 -> b
+    15:15:void processClass(com.android.tools.r8.graph.DexProgramClass):41:41 -> b
+    16:23:void processClass(com.android.tools.r8.graph.DexProgramClass):39:46 -> b
+    24:24:java.lang.String getName():57:57 -> b
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.et:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -25961,29 +26131,27 @@
     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
     4:4:java.lang.String getName():35:35 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.Ls:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.ft:
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.String getName():20:20 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.Ms:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.gt:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set allServiceImplementations -> c
     1:4:void <init>(com.android.tools.r8.graph.AppView):18:21 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:27 -> a
     1:1:java.lang.String getName():32:32 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.dt:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.xt:
     com.android.tools.r8.graph.AppView appView -> b
-    java.util.Set deadEnumLiteMaps -> c
-    1:5:void <init>(com.android.tools.r8.graph.AppView):21:25 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.AppView):24:24 -> <init>
-    1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):30:31 -> a
-    1:1:java.lang.String getName():36:36 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NotVerticallyMergedIntoSubtype -> com.android.tools.r8.internal.ft:
+    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 -> b
+com.android.tools.r8.horizontalclassmerging.policies.NotVerticallyMergedIntoSubtype -> com.android.tools.r8.internal.zt:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):15:16 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):21:24 -> a
     1:1:java.lang.String getName():29:29 -> b
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.Xv:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.rw:
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():29:29 -> <clinit>
@@ -25991,7 +26159,7 @@
     1:16:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):136:151 -> a
     17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup):139:139 -> a
     1:1:java.lang.String getName():33:33 -> b
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.Vv:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.pw:
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     boolean isAssumeNoSideEffectsMethod -> b
@@ -26003,7 +26171,7 @@
     5:5:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):63:63 -> a
     1:5:boolean equals(java.lang.Object):80:84 -> equals
     1:6:int hashCode():68:68 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.Wv:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.qw:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Map methodMap -> b
     1:4:void <init>():97:100 -> <init>
@@ -26016,85 +26184,85 @@
     6:6:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):109 -> a
     7:18:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):110:121 -> a
     19:19:boolean isSubjectToMethodMerging(com.android.tools.r8.graph.DexEncodedMethod):126:126 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoDifferentMainDexGroups -> com.android.tools.r8.internal.Yv:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoDifferentMainDexGroups -> com.android.tools.r8.internal.sw:
     com.android.tools.r8.synthesis.SyntheticItems synthetics -> d
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> c
-    1:3:void <init>(com.android.tools.r8.graph.AppView):21:23 -> <init>
-    1:2:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoDifferentMainDexGroups.getMergeKey(com.android.tools.r8.graph.DexProgramClass):28:29 -> a
+    1:3:void <init>(com.android.tools.r8.graph.AppView):22:24 -> <init>
+    1:2:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoDifferentMainDexGroups.getMergeKey(com.android.tools.r8.graph.DexProgramClass):29:30 -> a
     1:2:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    1:1:java.lang.String getName():35:35 -> b
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation -> com.android.tools.r8.internal.hw:
+    1:1:java.lang.String getName():36:36 -> b
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation -> com.android.tools.r8.internal.Bw:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache interfaceDefaultMethodsCache -> e
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ParentClassSignaturesCache parentClassMethodsCache -> f
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ReservedInterfaceSignaturesFor reservedInterfaceSignaturesFor -> g
     com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses subtypingForrestForClasses -> d
-    1:1:void <init>(com.android.tools.r8.graph.AppView):126:126 -> <init>
-    2:75:void <init>(com.android.tools.r8.graph.AppView):55:128 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):127:127 -> <init>
+    2:75:void <init>(com.android.tools.r8.graph.AppView):56:129 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$400(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):51:51 -> a
-    2:8:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):152:158 -> a
-    9:11:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation.computeReservedSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):144:146 -> a
-    9:11:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):159 -> a
-    12:20:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):160:168 -> a
-    21:22:void com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature.addSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory):138:139 -> a
-    21:22:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):171 -> a
-    23:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):173:175 -> a
-    26:26:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature):173:173 -> a
+    2:8:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):153:159 -> a
+    9:11:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation.computeReservedSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):145:147 -> a
+    9:11:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):160 -> a
+    12:20:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):161:169 -> a
+    21:22:void com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature.addSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory):139:140 -> a
+    21:22:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):172 -> a
+    23:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):174:176 -> a
+    26:26:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature):174:174 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache access$600(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):51:51 -> b
-    2:2:java.lang.String getName():64:64 -> b
+    2:2:java.lang.String getName():65:65 -> b
     1:1:com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses access$700(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):51:51 -> c
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1 -> com.android.tools.r8.internal.Zv:
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DexClassSignaturesCache -> com.android.tools.r8.internal.aw:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1 -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DexClassSignaturesCache -> com.android.tools.r8.internal.uw:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> b
-    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):83:83 -> <init>
-    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):83:83 -> <init>
-    1:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):86:87 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature -> com.android.tools.r8.internal.bw:
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):84:84 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):84:84 -> <init>
+    1:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):87:88 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature -> com.android.tools.r8.internal.vw:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():136:136 -> <clinit>
-    1:1:void <init>():136:136 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.cw:
-    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):91:91 -> <init>
-    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):91:91 -> <init>
-    1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):95:96 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory -> com.android.tools.r8.internal.dw:
+    1:1:void <clinit>():137:137 -> <clinit>
+    1:1:void <init>():137:137 -> <init>
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.ww:
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):92:92 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):92:92 -> <init>
+    1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):96:97 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory -> com.android.tools.r8.internal.xw:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory KEEP_ABSENT -> b
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory CLASS_HIERARCHY_SAFE -> a
-    1:2:void <clinit>():132:133 -> <clinit>
-    1:1:void <init>(java.lang.String,int):131:131 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ParentClassSignaturesCache -> com.android.tools.r8.internal.ew:
+    1:2:void <clinit>():133:134 -> <clinit>
+    1:1:void <init>(java.lang.String,int):132:132 -> <init>
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ParentClassSignaturesCache -> com.android.tools.r8.internal.yw:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> c
-    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):100:100 -> <init>
-    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):100:100 -> <init>
-    1:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):104:108 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.fw:
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):101:101 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):101:101 -> <init>
+    1:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):105:109 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.zw:
     com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> b
-    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):114:114 -> <init>
-    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):114:114 -> <init>
-    1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):114:114 -> a
-    2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):119:119 -> a
-    3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):118:121 -> a
-    7:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):120:122 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$SignaturesCache -> com.android.tools.r8.internal.gw:
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):115:115 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):115:115 -> <init>
+    1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):115:115 -> a
+    2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):120:120 -> a
+    3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):119:122 -> a
+    7:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):121:123 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$SignaturesCache -> com.android.tools.r8.internal.Aw:
     java.util.Map memoizedSignatures -> a
-    1:2:void <init>():67:68 -> <init>
-    3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):67:67 -> <init>
+    1:2:void <init>():68:69 -> <init>
+    3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):68:68 -> <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):71:71 -> 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):74:75 -> a
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.BA:
+    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexClass):72:72 -> 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):75:76 -> a
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.cB:
     com.android.tools.r8.graph.AppView appView -> c
-    1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
-    1:6:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):47:52 -> a
-    7:7:void tryFindRestrictedPackage(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map):60:60 -> a
-    8:10:boolean lambda$tryFindRestrictedPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):62:64 -> a
-    11:34:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):73:96 -> a
-    35:35:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$2(java.lang.String):80:80 -> a
-    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> a
-    36:36:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):29 -> a
-    37:57:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):34:54 -> a
-    1:1:java.lang.String getName():102:102 -> b
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.nB:
+    1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
+    1:6:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):48:53 -> a
+    7:7:void tryFindRestrictedPackage(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map):61:61 -> a
+    8:10:boolean lambda$tryFindRestrictedPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):63:65 -> a
+    11:34:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):74:97 -> a
+    35:35:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$2(java.lang.String):81:81 -> a
+    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> a
+    36:36:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):30 -> a
+    37:57:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):35:55 -> a
+    1:1:java.lang.String getName():103:103 -> b
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.OB:
     com.android.tools.r8.graph.AppView appView -> c
     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
@@ -26103,7 +26271,7 @@
     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 -> b
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.QB:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
     1:3:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):30:32 -> a
@@ -26113,7 +26281,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):32 -> a
     4:4:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):20 -> a
     1:1:java.lang.String getName():39:39 -> b
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.PB:
     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):47:52 -> <init>
@@ -26122,39 +26290,39 @@
     5:6:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):71:72 -> a
     1:5:boolean equals(java.lang.Object):77:81 -> equals
     1:1:int hashCode():86:86 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.RB:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):18:19 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameNestHost.getMergeKey(com.android.tools.r8.graph.DexProgramClass):24:24 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():29:29 -> b
-com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.SB:
     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 -> b
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.GE:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.iF:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
     1:5:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):30:34 -> a
     1:5:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    6:6:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):218:218 -> a
+    6:6:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):227:227 -> a
     6:6:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):38 -> a
     6:6:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     7:12:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):39:44 -> a
     7:12:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    13:13:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isJavaLambdaMergingEnabled():1213:1213 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isJavaLambdaMergingEnabled():1216:1216 -> a
     13:13:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):44 -> a
     13:13:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     14:14:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):45:45 -> a
     14:14:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():54:54 -> b
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.FE:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.hF:
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind NOT_SYNTHETIC -> b
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind SYNTHETIC -> a
     1:2:void <clinit>():18:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):17:17 -> <init>
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.w6:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.x6:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.references.ClassReference reference -> b
     1:1:void <init>(com.android.tools.r8.graph.DexClass):19:19 -> <init>
@@ -26164,7 +26332,7 @@
     1:1:void forEachField(java.util.function.Consumer):33:33 -> forEachField
     1:1:void forEachMethod(java.util.function.Consumer):38:38 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():25:28 -> getClassReference
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.yc:
     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
@@ -26178,14 +26346,14 @@
     3:6:java.util.Optional getInitialValue():47:50 -> getInitialValue
     1:1:boolean isFinal():42:42 -> isFinal
     1:1:boolean isStatic():37:37 -> isStatic
-com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.vg:
     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.br:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.ur:
     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
@@ -26195,7 +26363,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.tG:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.PG:
     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>
@@ -26256,9 +26424,9 @@
     1:1:boolean isPrimitive():46:46 -> isPrimitive
     1:1:boolean isShortValue():99:99 -> isShortValue
     1:1:boolean isStringValue():179:179 -> isStringValue
-com.android.tools.r8.internal.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.cD:
-    void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$InternalSyntheticThrowCCEIfNotNull$42$1ec04e58ebe7a109095d9c5c56defd2aedfd9cb5793d5e063011d44c4131fd81$0.m(java.lang.Object) -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.internal.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.DD:
+    void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$InternalSyntheticThrowCCEIfNotNull$97$1ec04e58ebe7a109095d9c5c56defd2aedfd9cb5793d5e063011d44c4131fd81$0.m(java.lang.Object) -> a
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.i6:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
     boolean $assertionsDisabled -> e
@@ -26277,12 +26445,12 @@
     1:1:void notifyCodeHasChanged():217:217 -> b
     2:4:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> b
     2:4:void notifyCodeHasChanged():218 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.h6$a:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.i6$a:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
     1:2:void <clinit>():57:58 -> <clinit>
     1:1:void <init>(java.lang.String,int):56:56 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.h6$b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.i6$b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():233:233 -> <clinit>
     1:6:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):241:246 -> a
@@ -26321,12 +26489,12 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     2:2:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480 -> b
     3:10:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480:487 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.h6$c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.i6$c:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
     1:2:void <clinit>():62:63 -> <clinit>
     1:1:void <init>(java.lang.String,int):61:61 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.da:
     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
@@ -26361,9 +26529,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.Pf:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.kg:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39:53 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.jg:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
     com.android.tools.r8.graph.ProgramMethod context -> b
@@ -26382,7 +26550,7 @@
     58:64:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
     65:65:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewInstance):153:153 -> a
     65:65:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):56 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.wF:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.WF:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> b
     boolean $assertionsDisabled -> c
@@ -26405,7 +26573,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.vG:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.RG:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> c
@@ -26419,13 +26587,9 @@
     24:24:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):165 -> a
     24:24:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
     24:24:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    25:25:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):166:166 -> a
-    25:25:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
-    25:25:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    26:26:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():205:205 -> a
-    26:26:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):167 -> a
-    26:26:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
-    26:26:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
+    25:26:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):166:167 -> a
+    25:26:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
+    25:26:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
     27:35:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addArrayValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):181:189 -> a
     27:35:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):147 -> a
     27:35:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
@@ -26483,7 +26647,7 @@
     210:210:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState.startTrackingValue(com.android.tools.r8.ir.code.Value):400:400 -> a
     210:210:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):347 -> a
     211:213:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):350:352 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.uG:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.QG:
     java.util.Set trackedValues -> b
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> c
     boolean hasTrackedValueEscaped -> a
@@ -26491,7 +26655,7 @@
     1:6:void <init>():367:372 -> <init>
     1:1:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState empty():375:375 -> a
     2:2:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):388:388 -> a
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.zG:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.VG:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -26505,7 +26669,7 @@
     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.C8:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.D8:
     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
@@ -26520,7 +26684,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.G8:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.H8:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -26542,12 +26706,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.no:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.Ko:
     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.xC:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.YC:
     java.util.Deque ssaEdges -> d
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -26636,14 +26800,14 @@
     117:130:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):234:247 -> b
     117:130:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     131:136:void setExecutableEdge(int,int):253:258 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.QE:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.sF:
     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.sG:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.OG:
     java.util.Map nodes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
@@ -26655,7 +26819,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.rG:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.NG:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -26726,7 +26890,7 @@
     1:1:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):172:172 -> c
     1:1:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):155 -> c
     2:10:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):158:166 -> c
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Yb:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Zb:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -26755,9 +26919,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.Zb:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.ac:
     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.kc:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.lc:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> c
@@ -26769,7 +26933,7 @@
     5:24:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):65:84 -> a
     25:30:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):83:88 -> a
     31:41:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):87:97 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.qc:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.rc:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set nonZeroFields -> d
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> b
@@ -26831,7 +26995,7 @@
     205:213:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):323:331 -> a
     214:214:void lambda$waveDone$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):328:328 -> a
     1:5:void initializeAbstractInstanceFieldValues():87:91 -> b
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.qc$a:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.rc$a:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     1:1:void <init>():344:344 -> <init>
@@ -26841,7 +27005,7 @@
     14:14:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):360:360 -> a
     15:16:void lambda$initialize$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):360:361 -> a
     17:24:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):368:375 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.qc$b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.rc$b:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
     1:1:void <init>():392:392 -> <init>
@@ -26850,7 +27014,7 @@
     3:6:void lambda$initialize$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):399:402 -> a
     7:7:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):400:400 -> a
     8:15:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):408:415 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.rc:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.sc:
     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
@@ -26862,7 +27026,7 @@
     20:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
     31:31:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
     32:48:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.iF:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.JF:
     java.util.Map readFields -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map writtenFields -> d
@@ -26934,7 +27098,7 @@
     1:1:java.util.Set access$300(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> d
     1:1:java.util.Set access$400(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$500(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> f
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification -> com.android.tools.r8.internal.gF:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification -> com.android.tools.r8.internal.HF:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification[] $VALUES -> d
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification UNKNOWN -> c
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$FieldClassification NON_CONSTANT -> b
@@ -26942,7 +27106,7 @@
     1:3:void <clinit>():44:46 -> <clinit>
     4:4:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(java.lang.String,int):43:43 -> <init>
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.hF:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.IF:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> d
     com.android.tools.r8.graph.ProgramMethod method -> c
@@ -27001,7 +27165,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.y8:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.z8:
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -27025,7 +27189,7 @@
     1:5:boolean equals(java.lang.Object):108:112 -> equals
     1:1:int hashCode():100:100 -> hashCode
     1:1:int size():95:95 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.cb:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.db:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -27034,7 +27198,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():18:18 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Kc:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Lc:
     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
@@ -27127,13 +27291,13 @@
     55:55:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():285 -> c
     56:80:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():286:310 -> c
     1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():69:72 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Jc:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Kc:
     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.ig:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Dg:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> k
     com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> l
@@ -27190,10 +27354,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):50:50 -> b
     4:4:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):221 -> b
     1:11:void analyzeParentConstructorCall():169:179 -> e
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.ym:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.Xm:
     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.eD:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.FD:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> i
     boolean $assertionsDisabled -> k
     java.util.Map computedValues -> j
@@ -27256,7 +27420,7 @@
     115:115:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):469 -> a
     116:139:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):470:493 -> a
     140:141:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):479:480 -> a
-    142:142:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1523:1523 -> a
+    142:142:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1549:1549 -> a
     142:142:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):480 -> a
     143:150:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):483:490 -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis asStaticFieldValueAnalysis() -> b
@@ -27317,7 +27481,7 @@
     94:94:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):376:376 -> d
     94:94:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):296 -> d
     95:136:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):299:340 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.kD:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.LD:
     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
@@ -27325,25 +27489,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():113:113 -> 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.fD:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.GD:
     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.hD:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.ID:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues INSTANCE -> a
     1:1:void <clinit>():104:104 -> <clinit>
     1:1:void <init>():106:106 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues getInstance():109:109 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.HD:
     1:1:void <init>():116:116 -> <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():126:126 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.KD:
     com.android.tools.r8.com.google.common.collect.ImmutableMap enumAbstractValues -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):42:43 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):99:99 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.iD:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.JD:
     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
@@ -27358,7 +27522,7 @@
     12:18:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):66:72 -> a
     19:19:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):71:71 -> a
     20:25:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():79:84 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.VF:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.vG:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -27372,21 +27536,21 @@
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction -> com.android.tools.r8.internal.R0:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.f9:
     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.c9:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.d9:
     1:1:void <init>():65:65 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.d9:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.e9:
     java.util.Map blockExitStates -> a
     1:2:void <init>(java.util.Map):41:42 -> <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():47:48 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.ic:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.jc:
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():20:20 -> a
     boolean isFailedTransferResult() -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.Wi:
     java.util.Map blockExitStates -> c
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState bottom -> a
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction transfer -> b
@@ -27417,7 +27581,7 @@
     26:27:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):43 -> a
     28:31:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.run(com.android.tools.r8.utils.WorkList):72:75 -> a
     28:31:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):43 -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.VE:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.xF:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     boolean isFailedTransferResult() -> b
     boolean isAbstractState() -> c
@@ -27447,33 +27611,33 @@
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     4:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32 -> a
     5:6:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32:33 -> a
-com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.vs:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.Os:
     com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint INSTANCE -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
-com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint -> com.android.tools.r8.internal.et:
+com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint -> com.android.tools.r8.internal.yt:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int):15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint create(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):21:21 -> a
     2:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):31:33 -> a
     5:7:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):38:40 -> a
-com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.ht:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.Bt:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int):15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint create(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):21:21 -> a
     2:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):31:33 -> a
     5:7:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):38:40 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.PB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.pC:
     int argumentIndex -> b
     1:2:void <init>(int):14:15 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getArgument(com.android.tools.r8.ir.code.InvokeMethod):19:19 -> b
     boolean isArgumentConstraint() -> d
     1:1:int getArgumentIndex():23:23 -> h
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.qC:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -27522,12 +27686,11 @@
     boolean isConjunction() -> e
     boolean isDisjunction() -> f
     boolean isNever() -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.sC:
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory factory -> a
-    java.util.Set seen -> e
+    java.util.Set seen -> d
     com.android.tools.r8.utils.InternalOptions options -> c
-    boolean $assertionsDisabled -> f
-    int simpleInliningConstraintThreshold -> d
+    boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):49:49 -> <init>
@@ -27590,10 +27753,10 @@
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):137:137 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):75:75 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):136 -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.rC:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():167:167 -> <clinit>
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.tC:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -27618,7 +27781,7 @@
     21:22:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60:61 -> a
     23:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):70:76 -> a
     30:30:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$rewrittenWithUnboxedArguments$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):73:73 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.uC:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -27643,7 +27806,7 @@
     23:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):70:76 -> a
     30:30:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$rewrittenWithUnboxedArguments$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):73:73 -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction() -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.VB:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.vC:
     com.android.tools.r8.ir.analysis.inlining.BooleanFalseSimpleInliningConstraint[] lowBooleanFalseConstraints -> a
     com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint[] lowNotNullConstraints -> c
     com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint[] lowNullConstraints -> d
@@ -27664,14 +27827,14 @@
     1:1:com.android.tools.r8.ir.analysis.inlining.BooleanTrueSimpleInliningConstraint lambda$createBooleanTrueConstraint$1(int):61:61 -> f
     1:1:com.android.tools.r8.ir.analysis.inlining.NotNullSimpleInliningConstraint lambda$createNotNullConstraint$2(int):69:69 -> g
     1:1:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$createNullConstraint$3(int):77:77 -> h
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.Mo:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.jp:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):20:33 -> a
-    15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1438:1438 -> a
+    15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1453:1453 -> a
     15:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33 -> a
     16:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33:41 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.Bb:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set deadEnumLiteMaps -> c
@@ -27680,7 +27843,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():1240:1240 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1243:1243 -> a
     2:2:void clearDeadEnumLiteMaps():59 -> a
     3:11:void clearDeadEnumLiteMaps():59:67 -> a
     12:12:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():74:74 -> a
@@ -27738,7 +27901,7 @@
     4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
     4:4:void verifyDeadEnumLiteMapsAreDead():148 -> c
     5:5:void verifyDeadEnumLiteMapsAreDead():148:148 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.Ad:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.Vd:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesWithRemovedExtensionFields -> c
@@ -27775,13 +27938,13 @@
     1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):101:102 -> b
     3:5:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):172:174 -> b
     1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):150:150 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.zd:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.Ud:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):107:107 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):112:112 -> a
     2:2:boolean com.android.tools.r8.shaking.DefaultTreePrunerConfiguration.isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22:22 -> a
     2:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):113 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Kd:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.fe:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map builders -> d
@@ -27849,7 +28012,7 @@
     2:2:boolean lambda$computeEnableAggressiveBuilderOptimization$1(com.android.tools.r8.graph.DexClass):111:111 -> b
     3:4:com.android.tools.r8.graph.analysis.EnqueuerAnalysis createEnqueuerAnalysis():127:128 -> b
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoReferences access$200(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):60:60 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Id:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.de:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> b
     java.util.Set val$seen -> a
     boolean $assertionsDisabled -> c
@@ -27862,7 +28025,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):154:157 -> a
     33:38:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):156:161 -> a
     39:39:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.ee:
     java.util.Set bypassClinitforInlining -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -27886,7 +28049,7 @@
     6:7:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():463:464 -> b
     6:7:void extend(com.android.tools.r8.graph.SubtypingInfo):426 -> b
     8:9:void neverMergeClass(com.android.tools.r8.graph.DexType):474:475 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.ge:
     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
@@ -27964,7 +28127,7 @@
     64:69:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):98:103 -> a
     70:70:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):107:107 -> a
     71:74:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):193:196 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.ey:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.wy:
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> f
     1:1:void <clinit>():24:24 -> <clinit>
@@ -27975,7 +28138,7 @@
     2:8:boolean com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.isStaticFieldReadForProtoSchemaDefinition(com.android.tools.r8.graph.DexField):76:82 -> e
     2:8:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):68 -> e
     9:12:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):69:72 -> e
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.fy:
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.xy:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     java.util.Map staticFieldValuesMap -> b
     java.util.Map staticFieldValuesMapDelayed -> c
@@ -27990,7 +28153,7 @@
     8:12:boolean isProtoEnum(com.android.tools.r8.graph.DexProgramClass):48:52 -> a
     13:24: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:68 -> a
     25:30: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.ky:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.Cy:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -28028,7 +28191,7 @@
     37:37:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
     38:41:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):79:82 -> a
     38:41:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.Ky:
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableMessageType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -28076,28 +28239,28 @@
     4:4:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):141:141 -> c
     4:4:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):183 -> c
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):187:187 -> d
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.sy$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.sy$b:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.Ky$a:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.Ky$b:
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):194:194 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):199:203 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):201:213 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:211 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.sy$c:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.Ky$c:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):288:288 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):293:297 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):295:302 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):300:300 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.sy$d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.Ky$d:
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):307:307 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):312:316 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):314:321 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):319:319 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.sy$e:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.Ky$e:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -28111,7 +28274,7 @@
     32:39:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):255:262 -> <init>
     40:55:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):260:275 -> <init>
     56:56:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):273:273 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.sy$f:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.Ky$f:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -28121,7 +28284,7 @@
     com.android.tools.r8.graph.DexField getMemoizedIsInitializedField -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):327:327 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):337:354 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.ty:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.Ly:
     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
@@ -28137,18 +28300,18 @@
     2:29:void <init>(com.android.tools.r8.graph.AppView):27:54 -> <init>
     1:1:java.util.Set getDeadProtoTypes():58:58 -> a
     2:4:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):68:70 -> a
-    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():807:807 -> a
+    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():810:810 -> a
     5:5:void setDeadProtoTypes(java.util.Set):63 -> a
     6:6:void setDeadProtoTypes(java.util.Set):64:64 -> a
-    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():808:808 -> a
+    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():811:811 -> a
     7:7:void setDeadProtoTypes(java.util.Set):63 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.wy:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.Oy:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
     1:3:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:26 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.Gy:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.Yy:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -28179,7 +28342,7 @@
     163:163:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     163:163: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
     164:166: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
-    167:172:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):472:477 -> a
+    167:172:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):476:481 -> a
     167:172: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
     173:177: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
     178:178:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
@@ -28206,7 +28369,7 @@
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):311:326 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):319:319 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308:308 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.Fy:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.Xy:
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):261:263 -> <init>
     1:1:boolean hasNext():267:267 -> a
@@ -28218,7 +28381,7 @@
     9:9:int nextInt():293:293 -> b
     10:10:int nextInt():282:282 -> b
     11:11:int nextInt():273:273 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.Gy$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.Yy$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -28233,10 +28396,10 @@
     16:16:java.lang.Object next():326 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():348:348 -> b
     17:17:java.lang.Object next():326 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.Gy$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.Yy$b:
     1:1:void <init>():371:371 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):371:371 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.Hy:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.Zy:
     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
@@ -28260,13 +28423,13 @@
     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.j9:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.k9:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexType holder -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):20:22 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:27 -> a
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.jp:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.Gp:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):23:24 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
@@ -28276,7 +28439,7 @@
     4:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:39 -> a
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> g
     1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.dy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.vy:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -28386,7 +28549,7 @@
     436:458:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):662:684 -> a
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):218:242 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$3(com.android.tools.r8.graph.DexType):354:354 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.gy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.yy:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -28443,11 +28606,11 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():66:66 -> d
     1:1:boolean hasAuxData():44:44 -> e
     1:15:java.lang.String toString():209:223 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.hy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.zy:
     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.iy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.Ay:
     boolean isMapFieldWithProto2EnumValue -> e
     boolean hasHasBit -> f
     boolean $assertionsDisabled -> g
@@ -28477,7 +28640,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.jy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.By:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -28486,7 +28649,7 @@
     4:18:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):56:70 -> a
     4:18:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     19:20:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):18:19 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.my:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.Ey:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -28507,8 +28670,8 @@
     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$1 -> com.android.tools.r8.internal.ly:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.my$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.Ey$a:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     boolean $assertionsDisabled -> f
@@ -28547,10 +28710,10 @@
     89:96:void removeUnusedSharedData():165:172 -> c
     97:97:void removeUnusedSharedData():171:171 -> c
     98:99:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.my$b:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.Ey$b:
     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.ny:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.Fy:
     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
@@ -28559,18 +28722,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.oy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.Gy:
     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.py:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.Hy:
     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.qy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.Iy:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -28582,7 +28745,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.ry:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.Jy:
     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>
@@ -28590,7 +28753,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.uy:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.My:
     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
@@ -28598,7 +28761,7 @@
     2:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> g
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.m6:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.n6:
     1:13:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:54 -> a
     14:14:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):610:610 -> a
     14:14:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
@@ -28615,7 +28778,7 @@
     68:81:boolean com.android.tools.r8.ir.code.IRCode.controlFlowMayDependOnEnvironment(java.util.function.Consumer):300:313 -> a
     68:81:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
     82:95:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93:106 -> a
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.internal.m6:
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CANNOT_BE_POSTPONED -> a
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CAN_BE_POSTPONED -> b
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect NONE -> c
@@ -28625,35 +28788,35 @@
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> f
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):31:34 -> <init>
-    1:1:boolean isPrimitiveArrayType():61:61 -> A
-    1:3:com.android.tools.r8.ir.analysis.type.TypeElement getBaseType():73:75 -> L
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberType():65:65 -> M
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():69:69 -> N
-    1:4:int getNesting():51:54 -> O
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):32:35 -> <init>
+    1:1:boolean isPrimitiveArrayType():62:62 -> A
+    1:3:com.android.tools.r8.ir.analysis.type.TypeElement getBaseType():74:76 -> L
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberType():66:66 -> M
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():70:70 -> N
+    1:4:int getNesting():52:55 -> O
     com.android.tools.r8.ir.analysis.type.ArrayTypeElement asArrayType() -> a
-    1:1:com.android.tools.r8.ir.analysis.type.ArrayTypeElement create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):23:23 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.ArrayTypeElement lambda$create$0(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):24:24 -> a
-    3:4:com.android.tools.r8.ir.analysis.type.ArrayTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):82:83 -> a
-    5:9:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):88:92 -> a
-    10:10:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):97:97 -> a
-    11:15:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.ArrayTypeElement.fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):138:142 -> a
-    11:15:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):15 -> a
-    16:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeElement,com.android.tools.r8.graph.AppView):149:160 -> a
-    28:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):167:177 -> a
-    39:50:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):173:184 -> a
-    51:53:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):393:395 -> a
-    51:53:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):187 -> a
-    54:56:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):394:396 -> a
-    54:56:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):187 -> a
-    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):389:389 -> a
-    57:57:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):185 -> a
-    1:9:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):38:46 -> b
-    1:8:boolean equals(java.lang.Object):120:127 -> equals
-    1:1:int hashCode():132:132 -> hashCode
+    1:1:com.android.tools.r8.ir.analysis.type.ArrayTypeElement create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):24:24 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.ArrayTypeElement lambda$create$0(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):25:25 -> a
+    3:4:com.android.tools.r8.ir.analysis.type.ArrayTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):83:84 -> a
+    5:9:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):89:93 -> a
+    10:10:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):98:98 -> a
+    11:15:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.ArrayTypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):141:145 -> a
+    11:15:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):16 -> a
+    16:27:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeElement,com.android.tools.r8.graph.AppView):152:163 -> a
+    28:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):170:180 -> a
+    39:50:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):176:187 -> a
+    51:53:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):416:418 -> a
+    51:53:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):190 -> a
+    54:56:com.android.tools.r8.ir.analysis.type.ArrayTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectArrayType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):417:419 -> a
+    54:56:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):190 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):412:412 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):188 -> a
+    1:9:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):39:47 -> b
+    1:8:boolean equals(java.lang.Object):121:128 -> equals
+    1:1:int hashCode():133:133 -> hashCode
     boolean isArrayType() -> r
-    1:1:java.lang.String toString():112:112 -> toString
+    1:1:java.lang.String toString():113:113 -> toString
 com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.d3:
     com.android.tools.r8.ir.analysis.type.BooleanTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
@@ -28676,75 +28839,80 @@
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.T5:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.S5:
     com.android.tools.r8.ir.analysis.type.CharTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.k7:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.l7:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> g
     com.android.tools.r8.ir.analysis.type.InterfaceCollection lazyInterfaces -> f
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> h
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):63:69 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.asMeetWithNotNull():126:126 -> J
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():29 -> J
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement asMeetWithNotNull():126:126 -> L
-    1:1:com.android.tools.r8.graph.DexType getClassType():73:73 -> M
-    1:8:com.android.tools.r8.ir.analysis.type.InterfaceCollection getInterfaces():77:84 -> N
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):29:29 -> a
-    2:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection):41:42 -> a
-    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants):44:44 -> a
-    5:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):54:54 -> a
-    6:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):89:90 -> a
-    8:10:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):109:111 -> a
-    11:11:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.lang.Boolean):111:111 -> a
-    12:14:java.lang.String lambda$toString$3(com.android.tools.r8.utils.Pair):143:145 -> a
-    15:64:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):160:209 -> a
-    65:65:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):179:179 -> a
-    66:66:void com.android.tools.r8.utils.BooleanBox.set():39:39 -> a
-    66:66:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):181 -> a
-    67:73:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):182:188 -> a
-    74:74:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    74:74:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):188 -> a
-    75:79:void lambda$fixupClassTypeReferences$4(java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):188:192 -> a
-    80:82:void lambda$fixupClassTypeReferences$5(java.util.function.Function,com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType,java.lang.Boolean):205:207 -> a
-    83:92:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):216:225 -> a
-    93:102:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):220:229 -> a
-    103:115:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):228:240 -> a
-    116:116:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.createUnmarked():280:280 -> a
-    116:116:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker lambda$computeLeastUpperBoundOfInterfaces$8(com.android.tools.r8.graph.DexType):407 -> a
-    117:146:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341:370 -> a
-    147:151:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):382:386 -> a
-    152:152:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    152:152:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):386 -> a
-    153:157:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):386:390 -> a
-    158:158:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
-    158:158:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):390 -> a
-    159:217:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):390:448 -> a
-    218:218:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):383:383 -> a
-    219:219:void lambda$computeLeastUpperBoundOfInterfaces$6(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):398:398 -> a
-    220:220:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forLeft(boolean):272:272 -> a
-    220:220:void lambda$computeLeastUpperBoundOfInterfaces$6(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):398 -> a
-    221:221:void lambda$computeLeastUpperBoundOfInterfaces$6(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):398:398 -> a
-    222:223:void lambda$computeLeastUpperBoundOfInterfaces$9(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):423:424 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):78:81 -> <init>
+    5:12:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):79:86 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.asMeetWithNotNull():139:139 -> J
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():30 -> J
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement asMeetWithNotNull():139:139 -> L
+    1:1:com.android.tools.r8.graph.DexType getClassType():90:90 -> M
+    1:7:com.android.tools.r8.ir.analysis.type.InterfaceCollection getInterfaces():94:100 -> N
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):30:30 -> a
+    2:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection):45:48 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):50:50 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):61:61 -> a
+    8:8:com.android.tools.r8.ir.analysis.type.ClassTypeElement createForD8(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
+    9:10:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$createForD8$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):68:69 -> a
+    11:12:com.android.tools.r8.ir.analysis.type.ClassTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):107:108 -> a
+    13:15:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):122:124 -> a
+    16:16:boolean lambda$isBasedOnMissingClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.lang.Boolean):124:124 -> a
+    17:19:java.lang.String lambda$toString$4(com.android.tools.r8.utils.Pair):156:158 -> a
+    20:77:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):175:232 -> a
+    78:78:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):186:186 -> a
+    79:82:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):196:199 -> a
+    83:83:void com.android.tools.r8.utils.BooleanBox.set():39:39 -> a
+    83:83:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):201 -> a
+    84:90:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):202:208 -> a
+    91:91:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    91:91:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):208 -> a
+    92:96:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):208:212 -> a
+    97:99:void lambda$fixupClassTypeReferences$6(java.util.function.Function,com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType,java.lang.Boolean):225:227 -> a
+    100:109:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):236:245 -> a
+    110:110:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):241:241 -> a
+    111:135:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinWithClassHierarchy(com.android.tools.r8.ir.analysis.type.ClassTypeElement):251:275 -> a
+    111:135:com.android.tools.r8.ir.analysis.type.ClassTypeElement join(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.AppView):247 -> a
+    136:136:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.createUnmarked():315:315 -> a
+    136:136:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker lambda$computeLeastUpperBoundOfInterfaces$9(com.android.tools.r8.graph.DexType):442 -> a
+    137:166:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):376:405 -> a
+    167:171:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):417:421 -> a
+    172:172:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    172:172:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):421 -> a
+    173:177:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):421:425 -> a
+    178:178:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
+    178:178:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):425 -> a
+    179:237:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):425:483 -> a
+    238:238:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):418:418 -> a
+    239:239:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):433:433 -> a
+    240:240:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forLeft(boolean):307:307 -> a
+    240:240:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):433 -> a
+    241:241:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):433:433 -> a
+    242:243:void lambda$computeLeastUpperBoundOfInterfaces$10(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):458:459 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType() -> b
-    1:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):51:52 -> b
-    3:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):100:104 -> b
-    8:8:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):401:401 -> b
-    9:9:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forRight(boolean):276:276 -> b
-    9:9:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):401 -> b
-    10:10:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):401:401 -> b
-    1:11:boolean equals(java.lang.Object):458:468 -> equals
-    1:1:int hashCode():154:154 -> hashCode
+    1:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):57:59 -> b
+    4:8:com.android.tools.r8.ir.analysis.type.ClassTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):113:117 -> b
+    9:9:void lambda$computeLeastUpperBoundOfInterfaces$8(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):436:436 -> b
+    10:10:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forRight(boolean):311:311 -> b
+    10:10:void lambda$computeLeastUpperBoundOfInterfaces$8(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):436 -> b
+    11:11:void lambda$computeLeastUpperBoundOfInterfaces$8(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):436:436 -> b
+    1:11:boolean equals(java.lang.Object):493:503 -> equals
+    1:1:int hashCode():167:167 -> hashCode
     boolean isClassType() -> s
-    1:16:java.lang.String toString():131:146 -> toString
-    17:26:java.lang.String toString():139:148 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.k7$a:
+    1:16:java.lang.String toString():144:159 -> toString
+    17:26:java.lang.String toString():152:161 -> toString
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.l7$a:
     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
@@ -28752,20 +28920,20 @@
     com.android.tools.r8.utils.OptionalBool right -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_UNKNOWN -> d
     boolean $assertionsDisabled -> g
-    1:17:void <clinit>():252:268 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):283:286 -> <init>
-    1:1:boolean isMarkedOnBothSides():294:294 -> a
-    2:3:com.android.tools.r8.utils.OptionalBool knownIfAnyIsKnown(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):298:299 -> a
-    4:4:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):308:308 -> a
-    5:5:boolean com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.isMarked():290:290 -> a
-    5:5:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):308 -> a
-    6:17:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):308:319 -> a
-    1:2:boolean knownIfBothAreKnown():303:304 -> b
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.k7$b:
+    1:17:void <clinit>():287:303 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):318:321 -> <init>
+    1:1:boolean isMarkedOnBothSides():329:329 -> a
+    2:3:com.android.tools.r8.utils.OptionalBool knownIfAnyIsKnown(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):333:334 -> a
+    4:4:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):343:343 -> a
+    5:5:boolean com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.isMarked():325:325 -> a
+    5:5:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):343 -> a
+    6:17:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):343:354 -> a
+    1:2:boolean knownIfBothAreKnown():338:339 -> b
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.l7$b:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):328:330 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.L9:
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):363:365 -> <init>
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.M9:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -28773,55 +28941,63 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):31:33 -> <init>
     1:11:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):40:50 -> a
-    12:18:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):96:102 -> a
-    12:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
-    19:19:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53:53 -> a
-    20:25:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):78:83 -> a
-    20:25:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    26:26:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    26:26:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):83 -> a
-    26:26:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    27:29:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):83:85 -> a
-    27:29:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    30:30:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
-    30:30:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):86 -> a
-    30:30:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    31:32:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):87:88 -> a
-    31:32:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    33:33:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):84:84 -> a
+    12:17:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):96:101 -> a
+    12:17:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
+    18:18:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function):76:76 -> a
+    18:18:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):101 -> a
+    18:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
+    19:19:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):102:102 -> a
+    19:19:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
+    20:20:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53:53 -> a
+    21:26:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):78:83 -> a
+    21:26:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    27:27:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    27:27:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):83 -> a
+    27:27:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    28:30:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):83:85 -> a
+    28:30:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    31:31:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
+    31:31:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):86 -> a
+    31:31:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    32:32:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):87:87 -> a
+    32:32:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    33:33:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function):76:76 -> a
+    33:33:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):88 -> a
     33:33:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
-    34:40:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):55:61 -> a
-    41:41:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    41:41:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61 -> a
-    42:49:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61:68 -> a
-    50:50:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    50:50:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68 -> a
-    51:56:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68:73 -> a
-    57:57:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    57:57:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73 -> a
-    58:58:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73:73 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.Pa:
+    34:34:boolean com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater.verifyAllPhiOperandsAreBottom(java.util.Set):84:84 -> a
+    34:34:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    35:41:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):55:61 -> a
+    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    42:42:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61 -> a
+    43:50:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):61:68 -> a
+    51:51:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    51:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68 -> a
+    52:57:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):68:73 -> a
+    58:58:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    58:58:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73 -> a
+    59:59:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73:73 -> a
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.Qa:
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getInstance():11:11 -> I
     1:1:int hashCode():26:26 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.dd:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.ed:
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getInstance():10:10 -> I
     1:1:int hashCode():25:25 -> hashCode
     1:1:java.lang.String toString():20:20 -> toString
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.ji:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.Ei:
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInstance():10:10 -> I
     1:1:int hashCode():25:25 -> hashCode
     1:1:java.lang.String toString():20:20 -> toString
-com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.ki:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.Fi:
     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
@@ -28836,7 +29012,7 @@
     7:7:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):108:108 -> a
     7:7:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):153 -> a
     8:10:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):155:157 -> a
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():1920:1920 -> a
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():1930:1930 -> a
     11:11:boolean isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24 -> a
     12:13:boolean isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):25:26 -> a
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection empty():69:69 -> b
@@ -28848,8 +29024,8 @@
     1:5:boolean equals(java.lang.Object):108:112 -> equals
     1:1:int size():100:100 -> f
     1:1:int hashCode():117:117 -> hashCode
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$1 -> com.android.tools.r8.internal.ki$a:
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.ki$b:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$1 -> com.android.tools.r8.internal.Fi$a:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.Fi$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.InterfaceCollection$1):32:32 -> <init>
     2:2:void <init>():35:35 -> <init>
@@ -28857,14 +29033,14 @@
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder addInterface(com.android.tools.r8.graph.DexType,boolean):49:49 -> a
     2:2:java.lang.Boolean lambda$addInterface$0(boolean,com.android.tools.r8.graph.DexType,java.lang.Boolean):53:53 -> a
     3:6:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():58:61 -> a
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.Mp:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.jq:
     com.android.tools.r8.ir.analysis.type.LongTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getInstance():11:11 -> I
     1:1:int hashCode():26:26 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.it:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.Ct:
     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
@@ -28885,7 +29061,7 @@
     2:2:boolean isNullable():45:45 -> g
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():87:87 -> h
     1:13:java.lang.String toString():96:108 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.jt:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.Dt:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
@@ -28897,7 +29073,7 @@
     4:12:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     13:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:35:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.jw:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.Dw:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -28944,10 +29120,10 @@
     15:15:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):57 -> b
     16:18:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):58:60 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.iw:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.Cw:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():113:113 -> <clinit>
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.oA:
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_INSTANCE -> d
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_BOTTOM_INSTANCE -> e
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
@@ -28970,20 +29146,20 @@
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
     1:1:boolean equals(java.lang.Object):101:101 -> equals
     1:1:int hashCode():106:106 -> hashCode
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.Nz$a:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.oA$a:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.NB:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.nC:
     com.android.tools.r8.ir.analysis.type.ShortTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.dC:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.DC:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -28991,7 +29167,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> H
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.TE:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.vF:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -28999,7 +29175,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> H
     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.rF:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.SF:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -29028,128 +29204,129 @@
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):56:59 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):82:82 -> b
     1:1:void widening(java.lang.Iterable):63:63 -> c
-com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.internal.qF:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.internal.RF:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NO_CHANGE -> d
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
     1:5:void <clinit>():25:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.yF:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.YF:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>():16:16 -> <init>
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:1:void <init>():20:20 -> <init>
     boolean isPrimitiveArrayType() -> A
     boolean isPrimitiveType() -> B
     boolean isReferenceType() -> C
     boolean isSinglePrimitive() -> D
     boolean isWidePrimitive() -> E
     com.android.tools.r8.ir.analysis.type.Nullability nullability() -> F
-    1:1:int requiredRegisters():384:384 -> G
+    1:1:int requiredRegisters():407:407 -> G
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> G
-    2:2:int requiredRegisters():384 -> G
+    2:2:int requiredRegisters():407 -> G
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> G
-    3:3:int requiredRegisters():384 -> G
-    4:4:int requiredRegisters():384:384 -> G
+    3:3:int requiredRegisters():407 -> G
+    4:4:int requiredRegisters():407:407 -> G
     com.android.tools.r8.ir.analysis.type.ArrayTypeElement asArrayType() -> a
-    com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView) -> a
+    com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set) -> a
     boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView) -> a
     1:1:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):92 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):95:95 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):115 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):118:118 -> a
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):95 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):118 -> a
     4:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    4:5:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):98 -> a
-    6:7:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):101:102 -> a
+    4:5:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):121 -> a
+    6:7:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):124:125 -> a
     8:20:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.join(com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement):134:146 -> a
-    8:20:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):102 -> a
-    21:30:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):102:111 -> a
+    8:20:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):125 -> a
+    21:30:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):125:134 -> a
     31:31:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
-    31:31:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):112 -> a
-    32:32:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):113:113 -> a
+    31:31:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):135 -> a
+    32:32:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):136:136 -> a
     33:33:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
-    33:33:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):115 -> a
-    34:36:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):116:118 -> a
-    37:37:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):389:389 -> a
-    37:37:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):119 -> a
-    38:46:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):122:130 -> a
-    47:47:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):99:99 -> a
-    48:50:com.android.tools.r8.ir.analysis.type.TypeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):134:136 -> a
-    51:59:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):216:224 -> a
-    60:60:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):285:285 -> a
-    61:62:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isClassType(com.android.tools.r8.graph.DexType):280:281 -> a
-    61:62:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):285 -> a
-    63:63:com.android.tools.r8.ir.analysis.type.ClassTypeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):400:400 -> a
-    64:64:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):408:408 -> a
-    65:72:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):413:420 -> a
+    33:33:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):138 -> a
+    34:36:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):139:141 -> a
+    37:37:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):412:412 -> a
+    37:37:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):142 -> a
+    38:46:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):145:153 -> a
+    47:47:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):122:122 -> a
+    48:48:com.android.tools.r8.ir.analysis.type.TypeElement rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):95:95 -> a
+    49:51:com.android.tools.r8.ir.analysis.type.TypeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):157:159 -> a
+    52:60:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):239:247 -> a
+    61:61:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):308:308 -> a
+    62:63:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isClassType(com.android.tools.r8.graph.DexType):303:304 -> a
+    62:63:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):308 -> a
+    64:64:com.android.tools.r8.ir.analysis.type.ClassTypeElement classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):423:423 -> a
+    65:65:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):431:431 -> a
+    66:73:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):436:443 -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType() -> b
-    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):162:162 -> b
-    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):167:168 -> b
-    2:3:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):162 -> b
-    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):389:389 -> b
+    1:1:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185:185 -> b
+    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):190:191 -> b
+    2:3:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185 -> b
+    4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):412:412 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
     1:1:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    1:1:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):182 -> c
-    2:2:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183:183 -> c
+    1:1:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):205 -> c
+    2:2:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):206:206 -> c
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    3:3:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):183 -> c
-    4:4:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185:185 -> c
+    3:3:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):206 -> c
+    4:4:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):208:208 -> c
     5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> c
-    5:5:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):185 -> c
+    5:5:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):208 -> c
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> c
-    6:6:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):188 -> c
+    6:6:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):211 -> c
     7:7:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> c
-    7:7:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):191 -> c
-    8:17:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):194:203 -> c
-    18:18:com.android.tools.r8.ir.analysis.type.ClassTypeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):404:404 -> c
+    7:7:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):214 -> c
+    8:17:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):217:226 -> c
+    18:18:com.android.tools.r8.ir.analysis.type.ClassTypeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):427:427 -> c
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
-    1:1:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):150:150 -> d
-    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):167:168 -> d
-    2:3:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):150 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getBoolean():27:27 -> e
-    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getBottom():19:19 -> f
-    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getByte():31:31 -> g
-    1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getChar():39:39 -> h
-    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getDouble():59:59 -> i
-    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getFloat():47:47 -> j
-    1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInt():43:43 -> k
-    1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getLong():55:55 -> l
-    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getNull():67:67 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getShort():35:35 -> n
-    1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getSingle():51:51 -> o
-    1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getTop():23:23 -> p
-    1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getWide():63:63 -> q
+    1:1:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):173:173 -> d
+    2:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):190:191 -> d
+    2:3:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):173 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getBoolean():31:31 -> e
+    1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getBottom():23:23 -> f
+    1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getByte():35:35 -> g
+    1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getChar():43:43 -> h
+    1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getDouble():63:63 -> i
+    1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getFloat():51:51 -> j
+    1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInt():47:47 -> k
+    1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getLong():59:59 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getNull():71:71 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getShort():39:39 -> n
+    1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getSingle():55:55 -> o
+    1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getTop():27:27 -> p
+    1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getWide():67:67 -> q
     boolean isArrayType() -> r
     boolean isClassType() -> s
-    1:1:boolean isDefinitelyNotNull():380:380 -> t
-    1:1:boolean isDefinitelyNull():376:376 -> u
+    1:1:boolean isDefinitelyNotNull():403:403 -> t
+    1:1:boolean isDefinitelyNull():399:399 -> u
     1:1:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBoolean():0:0 -> v
-    1:1:boolean isFineGrainedType():352 -> v
+    1:1:boolean isFineGrainedType():375 -> v
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isByte():0:0 -> v
-    2:2:boolean isFineGrainedType():353 -> v
+    2:2:boolean isFineGrainedType():376 -> v
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isShort():0:0 -> v
-    3:3:boolean isFineGrainedType():354 -> v
+    3:3:boolean isFineGrainedType():377 -> v
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isChar():0:0 -> v
-    4:4:boolean isFineGrainedType():355 -> v
+    4:4:boolean isFineGrainedType():378 -> v
     boolean isInt() -> w
     boolean isNullType() -> x
-    1:1:boolean isNullable():76:76 -> y
-    1:2:boolean isPreciseType():341:342 -> z
+    1:1:boolean isNullable():99:99 -> y
+    1:2:boolean isPreciseType():364:365 -> z
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> z
-    3:3:boolean isPreciseType():343 -> z
+    3:3:boolean isPreciseType():366 -> z
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> z
-    4:4:boolean isPreciseType():344 -> z
+    4:4:boolean isPreciseType():367 -> z
     5:5:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> z
-    5:5:boolean isPreciseType():345 -> z
+    5:5:boolean isPreciseType():368 -> z
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> z
-    6:6:boolean isPreciseType():346 -> z
+    6:6:boolean isPreciseType():369 -> z
     7:7:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> z
-    7:7:boolean isPreciseType():347 -> z
+    7:7:boolean isPreciseType():370 -> z
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> z
-    8:8:boolean isPreciseType():348 -> z
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.QG:
+    8:8:boolean isPreciseType():371 -> z
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.mH:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -29232,7 +29409,7 @@
     boolean isNonTrivial() -> s
     1:1:java.lang.String toString():48:48 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> y
-com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.M8:
     boolean containsInt(int) -> a
     com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]) -> a
     boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue) -> a
@@ -29241,7 +29418,7 @@
     com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue() -> d
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> e
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> i
-com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.jb:
+com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.kb:
     com.android.tools.r8.ir.analysis.value.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -29251,7 +29428,7 @@
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.analysis.value.EmptyObjectState getInstance():21:21 -> c
     1:1:int hashCode():51:51 -> hashCode
-com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.Ub:
+com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.Vb:
     com.android.tools.r8.ir.analysis.value.ObjectState[] state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -29267,14 +29444,14 @@
     1:1:int getEnumValuesSize():42:42 -> c
     1:9:boolean equals(java.lang.Object):72:80 -> equals
     1:1:int hashCode():89:89 -> hashCode
-com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.jt:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
     boolean isNonConstantNumberValue() -> c
     com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue() -> k
     boolean isConstantOrNonConstantNumberValue() -> q
     long getAbstractionSize() -> y
-com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.mt:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -29286,7 +29463,7 @@
     boolean isEmpty() -> b
     1:11:boolean equals(java.lang.Object):53:63 -> equals
     1:1:int hashCode():72:72 -> hashCode
-com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.gt:
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.At:
     com.android.tools.r8.ir.analysis.value.AbstractValue value -> b
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
@@ -29305,7 +29482,7 @@
     boolean isNonTrivial() -> s
     1:1:java.lang.String toString():66:66 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getNonNullValue():42:42 -> y
-com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.Ft:
     long maxInclusive -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -29334,7 +29511,7 @@
     boolean isNonTrivial() -> s
     1:1:java.lang.String toString():99:99 -> toString
     1:1:long getAbstractionSize():31:31 -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.nt:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.Ht:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
@@ -29357,8 +29534,8 @@
     boolean isNonTrivial() -> s
     1:7:java.lang.String toString():110:116 -> toString
     1:1:long getAbstractionSize():46:46 -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1 -> com.android.tools.r8.internal.mt:
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.nt$a:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1 -> com.android.tools.r8.internal.Gt:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.Ht$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():119:119 -> <clinit>
@@ -29367,14 +29544,14 @@
     1:4:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInt(int):132:135 -> a
     5:8:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInts(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):142:145 -> a
     9:17:com.android.tools.r8.ir.analysis.value.AbstractValue build(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):152:160 -> a
-com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.Au:
+com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.Uu:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.ir.analysis.value.EnumValuesObjectState asEnumValuesObjectState() -> a
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.zu:
+com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.Tu:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():67:67 -> <clinit>
@@ -29384,7 +29561,7 @@
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():25:25 -> a
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState build():79 -> a
     6:6:com.android.tools.r8.ir.analysis.value.ObjectState build():79:79 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.XB:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.xC:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():26:26 -> <clinit>
@@ -29392,7 +29569,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26:26 -> a
     2:7:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):69:74 -> a
     8:12:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):72:76 -> a
-    13:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):400:400 -> a
+    13:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):423:423 -> a
     13:13:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):76 -> a
     14:16:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):76:78 -> a
     17:17:boolean com.android.tools.r8.ir.code.ConstClass.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):135:135 -> a
@@ -29406,7 +29583,7 @@
     26:26:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90 -> a
     27:29:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90:92 -> a
     30:32:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98:100 -> a
-    33:33:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> a
+    33:33:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> a
     33:33:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101 -> a
     34:36:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101:103 -> a
     37:37:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:109 -> a
@@ -29415,11 +29592,11 @@
     com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue() -> m
     1:1:java.lang.String toString():61:61 -> toString
     1:1:com.android.tools.r8.graph.DexType getType():46:46 -> y
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.yC:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue() -> n
     boolean isSingleConstValue() -> u
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.aC:
+com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.AC:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     com.android.tools.r8.graph.DexReference item -> b
     boolean $assertionsDisabled -> d
@@ -29442,7 +29619,7 @@
     1:5:boolean equals(java.lang.Object):49:53 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.BC:
     com.android.tools.r8.graph.DexField field -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():28:28 -> <clinit>
@@ -29451,7 +29628,7 @@
     2:5:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):74:77 -> a
     6:7:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84:85 -> a
     8:18:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):90:100 -> a
-    19:19:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> a
+    19:19:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> a
     19:19:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):28:28 -> b
     2:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):43:49 -> b
@@ -29461,7 +29638,7 @@
     boolean isSingleFieldValue() -> v
     1:1:com.android.tools.r8.graph.DexField getField():37:37 -> y
     com.android.tools.r8.ir.analysis.value.ObjectState getState() -> z
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.CC:
     long value -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():22:22 -> <clinit>
@@ -29495,7 +29672,7 @@
     1:1:boolean isTrue():54:54 -> x
     1:2:boolean getBooleanValue():78:79 -> y
     1:1:int getIntValue():91:91 -> z
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.eC:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.EC:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.value.ObjectState state -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -29504,14 +29681,14 @@
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():28:28 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():23:23 -> z
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.FC:
     1:1:void <init>(com.android.tools.r8.graph.DexField):13:13 -> <init>
     1:5:boolean equals(java.lang.Object):28:32 -> equals
     1:1:int hashCode():37:37 -> hashCode
     1:1:java.lang.String toString():23:23 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():25:25 -> z
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():18 -> z
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.gC:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.GC:
     com.android.tools.r8.graph.DexString string -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():24:24 -> <clinit>
@@ -29527,7 +29704,7 @@
     1:1:java.lang.String toString():59:59 -> toString
     boolean isSingleStringValue() -> w
     1:1:com.android.tools.r8.graph.DexString getDexString():44:44 -> y
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.IC:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
@@ -29535,7 +29712,7 @@
     boolean isSingleValue() -> g
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> j
     boolean isNonTrivial() -> s
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.aG:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.AG:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -30317,7 +30494,7 @@
     97:97:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
     97:97:boolean replaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):342 -> a
     98:102:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):350:354 -> a
-    103:103:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):400:400 -> a
+    103:103: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):423:423 -> a
     103:103:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):354 -> a
     104:105:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):355:356 -> a
     106:106:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
@@ -30420,13 +30597,13 @@
     641:641:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):257 -> a
     642:647:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):259:264 -> a
     1:1:void add(java.lang.Object):38:38 -> add
-    1:6:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):376:381 -> b
-    7:8:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1157:1158 -> b
-    7:8:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):381 -> b
-    9:9:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
-    9:9:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):382 -> b
-    10:10:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):377:377 -> b
-    1:7:void add(com.android.tools.r8.ir.code.Instruction):122:128 -> c
+    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):376:381 -> 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):1157:1158 -> b
+    14:15:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):381 -> b
+    16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
+    16:16:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):382 -> b
+    17:17:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):377:377 -> b
     1:1:void unsetInsertionPosition():109:109 -> h
     1:1:boolean hasNext():67:67 -> hasNext
     1:1:boolean hasPrevious():83:83 -> hasPrevious
@@ -30487,7 +30664,7 @@
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1722:1722 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1732:1732 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
@@ -30507,27 +30684,28 @@
     1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> g2
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> r
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.H3:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.G3:
     java.util.Map canonicalPositions -> b
-    boolean $assertionsDisabled -> e
+    boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position callerPosition -> a
-    com.android.tools.r8.ir.code.Position syntheticPosition -> d
     com.android.tools.r8.ir.code.Position preamblePosition -> c
+    boolean isCompilerSynthesizedInlinee -> d
+    com.android.tools.r8.ir.code.Position syntheticPosition -> e
     1:1:void <clinit>():16:16 -> <clinit>
-    1:12:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod):27:38 -> <init>
-    1:1:com.android.tools.r8.ir.code.Position getPreamblePosition():42:42 -> a
-    2:4:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):61:63 -> a
-    5:5:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getCanonical(com.android.tools.r8.ir.code.Position):50:50 -> a
-    5:5:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):64 -> a
-    6:10:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):66:70 -> a
-    11:11:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getCanonical(com.android.tools.r8.ir.code.Position):50:50 -> a
-    11:11:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):67 -> a
-    12:21:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):80:89 -> a
-    22:22:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():42:42 -> a
-    22:22:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):93 -> a
-    23:32:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):94:103 -> a
-    1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):50:50 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.I3:
+    1:14:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod,boolean):29:42 -> <init>
+    1:1:com.android.tools.r8.ir.code.Position getPreamblePosition():47:47 -> a
+    2:4:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):65:67 -> a
+    5:5:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getCanonical(com.android.tools.r8.ir.code.Position):55:55 -> a
+    5:5:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):69 -> a
+    6:15:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):71:80 -> a
+    16:16:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getCanonical(com.android.tools.r8.ir.code.Position):55:55 -> a
+    16:16:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):77 -> a
+    17:26:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):90:99 -> a
+    27:27:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():47:47 -> a
+    27:27:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):103 -> a
+    28:37:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):104:113 -> a
+    1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):55:55 -> b
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.H3:
     java.util.List targets -> b
     java.util.List guards -> a
     java.util.Set uniqueTargets -> c
@@ -30557,14 +30735,14 @@
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:java.util.Iterator iterator():107:107 -> iterator
     1:2:int size():55:56 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.I3$a:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.H3$a:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):107:109 -> <init>
     1:1:boolean hasNext():113:113 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():118:121 -> next
     1:4:java.lang.Object next():107 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.I3$b:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.H3$b:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.lang.Object):24:26 -> <init>
@@ -30613,7 +30791,7 @@
     2:2:com.android.tools.r8.ir.code.CheckCast build():255:255 -> b
     3:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1569:1570 -> b
     3:4:com.android.tools.r8.ir.code.CheckCast build():255 -> b
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.I7:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.J7:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
@@ -30667,12 +30845,12 @@
     1:17:java.lang.String toString():104:120 -> toString
     18:19:java.lang.String toString():113:114 -> toString
     20:42:java.lang.String toString():109:131 -> toString
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.I7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$Cmp$Bias -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():90:90 -> <clinit>
     2:2:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.I7$a:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.J7$a:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
     com.android.tools.r8.ir.code.Cmp$Bias GT -> b
@@ -30681,7 +30859,7 @@
     2:2:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():28:28 -> a
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.B8:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
@@ -30707,7 +30885,7 @@
     13:13:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):135:135 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):161:161 -> a
     15:15:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):166:166 -> a
-    16:16:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):400:400 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):423:423 -> a
     16:16:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):166 -> a
     17:17:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):171:171 -> a
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):176:176 -> a
@@ -30722,7 +30900,7 @@
     1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> c2
     1:1:java.lang.String toString():83:83 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.B8:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.C8:
     int $r8$clinit -> h
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> I0
@@ -30733,7 +30911,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> i1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.D8:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.E8:
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -30766,7 +30944,7 @@
     1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> c2
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.E8:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.F8:
     com.android.tools.r8.graph.DexProto methodType -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -30798,7 +30976,7 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     1:1:java.lang.String toString():87:87 -> toString
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.F8:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.G8:
     long value -> i
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
@@ -30869,10 +31047,10 @@
     1:1:boolean negativeIs8Bit():284:284 -> o2
     1:4:java.lang.String toString():260:263 -> toString
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.F8$a:
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.G8$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():188:188 -> <clinit>
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.H8:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.I8:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     com.android.tools.r8.graph.DexString value -> i
@@ -30908,7 +31086,7 @@
     1:1:com.android.tools.r8.graph.DexString getValue():61:61 -> c2
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.N8:
     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
@@ -30916,20 +31094,20 @@
     7:7:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):25 -> a
     8:15:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):26:33 -> a
     16:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
-    19:19:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
+    19:19:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
     19:19:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
     20:20:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    21:21:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
+    21:21:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
     21:21:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
     22:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    23:23:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
+    23:23:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
     23:23:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45 -> a
     24:28:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45:49 -> a
     29:36:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):48:55 -> a
     37:37:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     37:37:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     38:38:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.m9:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.n9:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> N0
     1:1:int maxInValueRegister():60:60 -> W1
@@ -30947,11 +31125,11 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.o9:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> X0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.o9:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.p9:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
@@ -30965,7 +31143,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.p9:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.q9:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
@@ -30999,7 +31177,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> d2
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.q9:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.r9:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -31021,7 +31199,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.r9:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.s9:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -31034,12 +31212,12 @@
     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.z9:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.A9:
     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.NewInstance) -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.xa:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexReference item -> i
     boolean $assertionsDisabled -> k
@@ -31076,7 +31254,7 @@
     1:1:com.android.tools.r8.graph.DexReference getItem():59:59 -> c2
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():63:63 -> d2
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.Ia:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.Ja:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     com.android.tools.r8.ir.code.Div asDiv() -> D
     1:1:boolean instructionTypeCanThrow():134:134 -> V0
@@ -31106,7 +31284,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> h2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.La:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -31138,7 +31316,7 @@
     5:5:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):328:328 -> c
     1:2:void numberBlocks():240:241 -> d
     1:9:java.lang.String toString():308:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.Ja:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.Ka:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock current -> a
@@ -31147,16 +31325,16 @@
     1:1:boolean hasNext():201:201 -> hasNext
     1:9:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree$1.next():206:214 -> next
     1:9:java.lang.Object next():196 -> next
-com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.internal.Ka$a:
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.internal.La$a:
     com.android.tools.r8.ir.code.DominatorTree$Assumption MAY_HAVE_UNREACHABLE_BLOCKS -> b
     com.android.tools.r8.ir.code.DominatorTree$Assumption NO_UNREACHABLE_BLOCKS -> a
     1:2:void <clinit>():19:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.La:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.Ma:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> a
     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.Va:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.Wa:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
@@ -31185,7 +31363,7 @@
     2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> d2
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> e2
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Ua:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Va:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> <init>
@@ -31206,7 +31384,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.yc:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.zc:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
     1:1:void <clinit>():26:26 -> <clinit>
@@ -31234,7 +31412,7 @@
     com.android.tools.r8.ir.code.Value value() -> e2
     1:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):136:159 -> f
     boolean isFieldInstruction() -> q1
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.zc:
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.Ac:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
     com.android.tools.r8.ir.code.FieldMemberType[] $VALUES -> j
     com.android.tools.r8.ir.code.FieldMemberType LONG -> h
@@ -31263,7 +31441,7 @@
     43:43:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromTypeDescriptorChar(char):30:30 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Sc:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Tc:
     boolean $assertionsDisabled -> r
     int register -> q
     1:1:void <clinit>():12:12 -> <clinit>
@@ -31287,7 +31465,7 @@
     22:23:com.android.tools.r8.ir.code.ValueType outType():43:44 -> e0
     1:1:int getRegister():50:50 -> k0
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Rd:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.me:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -31305,7 +31483,7 @@
     1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> d2
     boolean isGoto() -> s1
     1:4:java.lang.String toString():71:74 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.xe:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.Se:
     boolean $assertionsDisabled -> l
     boolean numbered -> f
     int nextInstructionNumber -> g
@@ -31670,10 +31848,10 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod method():159:159 -> x
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():1051:1053 -> y
     1:7:int numberRemainingInstructions():1059:1065 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.xe$a:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.Se$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):99:100 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.xe$b:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.Se$b:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
@@ -31682,7 +31860,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):72:76 -> <init>
     1:2:boolean equals(java.lang.Object):86:87 -> equals
     1:1:int hashCode():81:81 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.ye:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.Te:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -31697,7 +31875,7 @@
     10:10:java.lang.Object next():10 -> next
     1:10:com.android.tools.r8.ir.code.Instruction previous():48:57 -> previous
     11:11:com.android.tools.r8.ir.code.Instruction previous():52:52 -> previous
-com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.ze:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.Ue:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -31742,7 +31920,7 @@
     1:1:void set(java.lang.Object):22:22 -> set
     2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):205:205 -> set
     2:2:void set(java.lang.Object):22 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.Ae:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.Ve:
     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
@@ -31760,7 +31938,7 @@
     75:78:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
     1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):114:114 -> b
     2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):113:113 -> b
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.We:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -31880,7 +32058,7 @@
     1:1:boolean mayHaveInvokeSuper():202:202 -> x
     1:1:boolean mayHaveInvokeVirtual():206:206 -> y
     1:1:boolean mayHaveMonitorInstruction():210:210 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.ff:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     com.android.tools.r8.ir.code.If$Type type -> i
@@ -31928,10 +32106,10 @@
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():228:230 -> k2
     boolean isIf() -> t1
     1:8:java.lang.String toString():169:176 -> toString
-com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.Ke$a:
+com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.ff$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():27:27 -> <clinit>
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.Ke$b:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.ff$b:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
     com.android.tools.r8.ir.code.If$Type EQ -> a
@@ -31954,10 +32132,10 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> b
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> b
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> c
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Bf:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Wf:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> b
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Xf:
     boolean $assertionsDisabled -> i
     int increment -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -31973,7 +32151,7 @@
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.fg:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():26:26 -> <clinit>
@@ -32001,8 +32179,8 @@
     1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:134 -> d
     1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> d2
     1:1:java.lang.String toString():171:171 -> toString
-com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.If:
-com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.Jf:
+com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.dg:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.eg:
     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>
@@ -32011,9 +32189,9 @@
     1:1:com.android.tools.r8.ir.code.InitClass build():187:187 -> b
     2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1569:1570 -> b
     2:3:com.android.tools.r8.ir.code.InitClass build():187 -> b
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Bg:
     com.android.tools.r8.ir.code.Value object() -> c
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.jg:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Eg:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -32055,7 +32233,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:com.android.tools.r8.ir.code.Value value():68:68 -> e2
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.mg:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.Hg:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> L
@@ -32080,7 +32258,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:com.android.tools.r8.ir.code.Value value():48:48 -> d2
     1:2:java.lang.String toString():127:128 -> toString
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.ng:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.Ig:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:38 -> <init>
@@ -32118,7 +32296,7 @@
     1:1:java.lang.String toString():214:214 -> toString
     boolean isInstanceFieldInstruction() -> u1
     boolean isInstancePut() -> w1
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.qg:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.Lg:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
     int number -> d
@@ -32392,19 +32570,24 @@
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
     com.android.tools.r8.ir.code.Ushr asUshr() -> z0
     boolean isInvokeDirect() -> z1
-com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.qg$a:
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.Lg$a:
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.code.Value outValue -> a
     1:1:void <init>():1559:1559 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:2:com.android.tools.r8.ir.code.Instruction$BuilderBase setOutValue(com.android.tools.r8.ir.code.Value):1576:1577 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1581:1581 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1585:1585 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1581 -> a
     4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1576:1577 -> a
+    4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1585 -> a
     4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1581 -> a
-    6:6:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1590:1590 -> a
-    7:8:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1585:1586 -> a
-    7:8:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1590 -> a
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.qg$b:
+    6:6:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1585:1585 -> a
+    7:8:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1576:1577 -> a
+    7:8:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1585 -> a
+    9:9:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1594:1594 -> a
+    10:11:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1589:1590 -> a
+    10:11:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1594 -> a
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.Lg$b:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption NONE -> a
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption CLASS_ALREADY_INITIALIZED -> b
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption INVOKED_METHOD_DOES_NOT_HAVE_SIDE_EFFECTS -> c
@@ -32415,24 +32598,24 @@
     1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1536:1536 -> a
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.rg:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.Mg:
     1:1:void <init>():1497:1497 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.sg:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.Ng:
     1:1:void <init>():1506:1506 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.tg:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.Og:
     1:1:void <init>():1515:1515 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.ug:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.Pg:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption val$other -> e
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption this$0 -> f
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1536:1536 -> <init>
     1:2:boolean canAssumeClassIsAlreadyInitialized():1540:1541 -> a
     1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1546:1547 -> b
     1:2:boolean canAssumeReceiverIsNotNull():1552:1553 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.wg:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.Rg:
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> e
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> f
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.xg:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.Sg:
     void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions) -> a
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
@@ -32449,28 +32632,27 @@
     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:3:void addBefore(com.android.tools.r8.ir.code.Instruction):32:34 -> a
-    4:4:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):89:89 -> a
-    5:5:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):93:93 -> a
-    6:6:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):117:117 -> a
-    7:7:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):116:116 -> a
-    8:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):171:171 -> a
-    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):175:175 -> a
-    10:12:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):253:255 -> a
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):89:89 -> 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):93:93 -> a
+    4:4:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):117:117 -> a
+    5:5:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):116:116 -> a
+    6:6:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):171:171 -> a
+    7:7:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):175:175 -> a
+    8:10:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):253:255 -> a
     void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> b
     1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> b
     1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> b
-    4:4:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):205:205 -> b
+    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):205:205 -> b
     void unsetInsertionPosition() -> h
     void removeOrReplaceByDebugLocalRead() -> i
     1:1:void removeInstructionIgnoreOutValue():67:67 -> l
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.yg:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.Tg:
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> d
     boolean isPhi() -> e
     com.android.tools.r8.ir.code.Instruction asInstruction() -> g
     com.android.tools.r8.ir.code.Phi asPhi() -> h
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.ii:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Di:
     boolean $assertionsDisabled -> m
     int[] keys -> l
     1:1:void <clinit>():28:28 -> <clinit>
@@ -32536,100 +32718,100 @@
     5:5:java.lang.String toString():274 -> toString
     6:11:java.lang.String toString():274:279 -> toString
     boolean isIntSwitch() -> x1
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.Hi:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.cj:
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):109:109 -> <init>
-    1:1:java.lang.String getInstructionName():333:333 -> F0
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):110:110 -> <init>
+    1:1:java.lang.String getInstructionName():339:339 -> F0
     com.android.tools.r8.ir.code.Invoke asInvoke() -> O
     boolean instructionTypeCanThrow() -> V0
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> W1
-    1:1:int maxInValueRegister():277 -> W1
-    2:4:int maxInValueRegister():277:279 -> W1
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> W1
+    1:1:int maxInValueRegister():283 -> W1
+    2:4:int maxInValueRegister():283:285 -> W1
     int maxOutValueRegister() -> X1
-    1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):120:140 -> a
-    22:24:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):136:138 -> a
-    25:25:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):134:134 -> a
-    26:26:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):132:132 -> a
-    27:27:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):130:130 -> a
-    28:28:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):128:128 -> a
-    29:29:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):126:126 -> a
-    30:30:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):124:124 -> a
-    31:31:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):122:122 -> a
-    32:32:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):176:176 -> a
-    33:33:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
-    33:33:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):177 -> a
-    34:34:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):177:177 -> a
-    35:35:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
-    35:35:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):183 -> a
-    36:36:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):183:183 -> a
-    37:37:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):189:189 -> a
-    38:38:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
-    38:38:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):191 -> a
-    39:48:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):191:200 -> a
+    1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):121:141 -> a
+    22:24:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):137:139 -> a
+    25:25:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):135:135 -> a
+    26:26:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):133:133 -> a
+    27:27:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):131:131 -> a
+    28:28:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):129:129 -> a
+    29:29:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):127:127 -> a
+    30:30:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):125:125 -> a
+    31:31:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):123:123 -> a
+    32:32:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):182:182 -> a
+    33:33:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
+    33:33:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):183 -> a
+    34:34:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):183:183 -> a
+    35:35:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
+    35:35:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):189 -> a
+    36:36:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):189:189 -> a
+    37:37:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):195:195 -> a
+    38:38:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
+    38:38:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):197 -> a
+    39:48:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):197:206 -> a
     49:49:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> a
-    49:49:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):201 -> a
-    50:52:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):202:204 -> a
+    49:49:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):207 -> a
+    50:52:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):208:210 -> a
     53:53:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> a
-    53:53:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):204 -> a
-    54:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):204:204 -> a
+    53:53:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):210 -> a
+    54:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):210:210 -> a
     55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> a
-    55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):205 -> a
-    56:57:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):206:207 -> a
-    58:71:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):226:239 -> a
-    72:76:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):237:241 -> a
-    77:93:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):247:263 -> a
-    94:100:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):261:267 -> a
-    101:105:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):348:352 -> a
-    106:106:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):350:350 -> a
-    107:107:boolean outTypeKnownToBeBoolean(java.util.Set):357:357 -> a
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> b
-    1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):214 -> b
-    2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):214:215 -> b
+    55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):211 -> a
+    56:57:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):212:213 -> a
+    58:71:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):232:245 -> a
+    72:76:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):243:247 -> a
+    77:93:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):253:269 -> a
+    94:100:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):267:273 -> a
+    101:105:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):354:358 -> a
+    106:106:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):356:356 -> a
+    107:107:boolean outTypeKnownToBeBoolean(java.util.Set):363:363 -> a
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> b
+    1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):220 -> b
+    2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):220:221 -> b
     4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> b
-    4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):215 -> b
-    5:5:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> b
-    5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):216 -> b
-    6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):216:216 -> b
-    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> b
-    7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):217 -> b
-    8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):217:218 -> b
+    4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):221 -> b
+    5:5:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> b
+    5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):222 -> b
+    6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):222:222 -> b
+    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> b
+    7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):223 -> b
+    8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):223:224 -> b
     10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> b
-    10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):219 -> b
-    11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> b
-    11:11:com.android.tools.r8.ir.code.Value getArgument(int):160 -> b
-    12:12:com.android.tools.r8.ir.code.Value getArgument(int):160:160 -> b
-    1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):304:304 -> c
-    2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c
-    2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):311 -> c
-    3:10:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):311:318 -> c
-    11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> c
-    11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):319 -> c
-    12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):319:320 -> c
-    1:1:java.util.List arguments():156:156 -> c2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    1:1:boolean argumentsAreConsecutiveInputArguments():286 -> d2
-    2:2:boolean argumentsAreConsecutiveInputArguments():286:286 -> d2
-    3:3:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    3:3:boolean argumentsAreConsecutiveInputArguments():289 -> d2
-    4:5:boolean argumentsAreConsecutiveInputArguments():289:290 -> d2
-    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    6:6:boolean argumentsAreConsecutiveInputArguments():293 -> d2
-    7:7:boolean argumentsAreConsecutiveInputArguments():293:293 -> d2
-    8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> d2
-    8:8:boolean argumentsAreConsecutiveInputArguments():294 -> d2
-    9:10:boolean argumentsAreConsecutiveInputArguments():294:295 -> d2
+    10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):225 -> b
+    11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> b
+    11:11:com.android.tools.r8.ir.code.Value getArgument(int):161 -> b
+    12:12:com.android.tools.r8.ir.code.Value getArgument(int):161:161 -> b
+    1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):310:310 -> c
+    2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> c
+    2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):317 -> c
+    3:10:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):317:324 -> c
+    11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> c
+    11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):325 -> c
+    12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):325:326 -> c
+    1:1:java.util.List arguments():157:157 -> c2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> d2
+    1:1:boolean argumentsAreConsecutiveInputArguments():292 -> d2
+    2:2:boolean argumentsAreConsecutiveInputArguments():292:292 -> d2
+    3:3:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> d2
+    3:3:boolean argumentsAreConsecutiveInputArguments():295 -> d2
+    4:5:boolean argumentsAreConsecutiveInputArguments():295:296 -> d2
+    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> d2
+    6:6:boolean argumentsAreConsecutiveInputArguments():299 -> d2
+    7:7:boolean argumentsAreConsecutiveInputArguments():299:299 -> d2
+    8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> d2
+    8:8:boolean argumentsAreConsecutiveInputArguments():300 -> d2
+    9:10:boolean argumentsAreConsecutiveInputArguments():300:301 -> d2
     com.android.tools.r8.graph.DexType getReturnType() -> e2
     com.android.tools.r8.ir.code.Invoke$Type getType() -> f2
     java.lang.String getTypeString() -> g2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> h2
-    1:1:boolean hasArguments():148 -> h2
-    2:2:boolean hasArguments():148:148 -> h2
-    1:1:int requiredArgumentRegisters():169:169 -> i2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> h2
+    1:1:boolean hasArguments():149 -> h2
+    2:2:boolean hasArguments():149:149 -> h2
+    1:1:int requiredArgumentRegisters():175:175 -> i2
     2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():260:260 -> i2
-    2:2:int requiredArgumentRegisters():170 -> i2
+    2:2:int requiredArgumentRegisters():176 -> i2
     boolean isInvoke() -> y1
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.Hi$a:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.cj$a:
     com.android.tools.r8.ir.code.Invoke$Type SUPER -> f
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Invoke$Type VIRTUAL -> g
@@ -32643,16 +32825,16 @@
     com.android.tools.r8.ir.code.Invoke$Type POLYMORPHIC -> k
     int dexOpcode -> a
     com.android.tools.r8.ir.code.Invoke$Type[] $VALUES -> l
-    1:11:void <clinit>():36:36 -> <clinit>
-    1:3:void <init>(java.lang.String,int,int,int):50:52 -> <init>
-    1:16:int getCfOpcode():56:71 -> a
-    17:33:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):86:102 -> a
-    34:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):90:100 -> a
-    45:55:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):88:98 -> a
-    56:59:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):92:95 -> a
-    1:2:int getDexOpcode():76:77 -> b
-    1:2:int getDexOpcodeRange():81:82 -> c
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.Ii:
+    1:11:void <clinit>():37:37 -> <clinit>
+    1:3:void <init>(java.lang.String,int,int,int):51:53 -> <init>
+    1:16:int getCfOpcode():57:72 -> a
+    17:33:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):87:103 -> a
+    34:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):91:101 -> a
+    45:55:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):89:99 -> a
+    56:59:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):93:96 -> a
+    1:2:int getDexOpcode():77:78 -> b
+    1:2:int getDexOpcodeRange():82:83 -> c
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.dj:
     com.android.tools.r8.graph.DexCallSite callSite -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -32666,44 +32848,45 @@
     19:29:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):82:92 -> a
     30:40:boolean com.android.tools.r8.ir.code.InvokeCustom.verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.graph.DexType):48:58 -> a
     30:40:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):94 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):96:96 -> a
-    42:42:void lambda$evaluate$0(com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType):91:91 -> a
-    43:43:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    43:43:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196 -> a
-    44:44:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196:196 -> a
-    45:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):126:131 -> a
-    51:51:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131 -> a
-    52:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131:135 -> a
-    57:57:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    57:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137 -> a
-    58:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137:144 -> a
-    66:66:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
-    67:67:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    67:67:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149 -> a
-    68:68:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
-    69:69:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):170:170 -> a
-    70:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():168:168 -> a
-    70:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):170 -> a
-    71:71:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:177 -> a
-    72:72:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    72:72:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178 -> a
-    73:76:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:181 -> a
-    77:77:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():105:105 -> a
-    77:77:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182 -> a
-    78:81:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182:185 -> a
-    82:82:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):184:184 -> a
-    82:82:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154:154 -> b
+    41:41:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):97:97 -> a
+    42:42:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):96:96 -> a
+    43:43:void lambda$evaluate$0(com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType):91:91 -> a
+    44:44:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():106:106 -> a
+    44:44:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):197 -> a
+    45:45:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):197:197 -> a
+    46:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):127:132 -> a
+    52:52:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():106:106 -> a
+    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):132 -> a
+    53:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):132:136 -> a
+    58:58:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():106:106 -> a
+    58:58:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):138 -> a
+    59:66:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):138:145 -> a
+    67:67:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:150 -> a
+    68:68:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():106:106 -> a
+    68:68:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150 -> a
+    69:69:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:150 -> a
+    70:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):171:171 -> a
+    71:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():168:168 -> a
+    71:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):171 -> a
+    72:72:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:178 -> a
+    73:73:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():106:106 -> a
+    73:73:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):179 -> a
+    74:77:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):179:182 -> a
+    78:78:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():106:106 -> a
+    78:78:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):183 -> a
+    79:82:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):183:186 -> a
+    83:83:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):184:184 -> a
+    83:83:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):155:155 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> b
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154 -> b
-    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154:154 -> b
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):155 -> b
+    3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):155:155 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> e2
-    1:1:java.lang.String getTypeString():115:115 -> g2
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> j2
-    1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.Ki:
+    1:1:com.android.tools.r8.graph.DexType getReturnType():102:102 -> e2
+    1:1:java.lang.String getTypeString():116:116 -> g2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():106:106 -> j2
+    1:1:java.lang.String toString():121:121 -> toString
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.fj:
     boolean $assertionsDisabled -> m
     boolean isInterface -> l
     1:1:void <clinit>():33:33 -> <clinit>
@@ -32737,7 +32920,7 @@
     1:1:java.lang.String getTypeString():71:71 -> g2
     1:1:boolean getInterfaceBit():56:56 -> j2
     boolean isInvokeDirect() -> z1
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.Mi:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.hj:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
@@ -32759,7 +32942,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> f2
     1:1:java.lang.String getTypeString():57:57 -> g2
     boolean getInterfaceBit() -> j2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.Ni:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.ij:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
     1:1:void <clinit>():40:40 -> <clinit>
@@ -32774,13 +32957,13 @@
     2:2:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):138 -> a
     3:3:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):139:139 -> a
     4:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):157:162 -> a
-    10:10:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
+    10:10:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
     10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):167 -> a
     11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):167:167 -> a
-    12:12:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
+    12:12:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
     12:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):168 -> a
     13:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):168:169 -> a
-    15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
+    15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
     15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):169 -> a
     16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):169:169 -> a
     17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):180:188 -> a
@@ -32812,13 +32995,13 @@
     boolean getInterfaceBit() -> j2
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():57:57 -> k2
     1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.Ni$a:
+com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.ij$a:
     java.util.List arguments -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> c
     1:1:void <clinit>():246:246 -> <clinit>
     1:5:void <init>():246:250 -> <init>
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.Oi:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.jj:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
@@ -32851,11 +33034,11 @@
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):166 -> c
     5:5:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):48 -> c
     1:6:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):82:87 -> i
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> l2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> l2
     1:1:java.lang.Iterable getNonReceiverArguments():37 -> l2
     2:2:java.lang.Iterable getNonReceiverArguments():37:37 -> l2
     1:2:com.android.tools.r8.ir.code.Value getReceiver():63:64 -> m2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.Pi:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.kj:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -32868,7 +33051,7 @@
     3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):96:96 -> a
     4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):101:102 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
-    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> a
+    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107 -> a
     8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
     9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:112 -> a
@@ -32888,10 +33071,10 @@
     1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> e2
     1:1:java.lang.String getTypeString():70:70 -> g2
     1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> j2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():156:156 -> k2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():157:157 -> k2
     1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> k2
     2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> k2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.Qi:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.lj:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -32923,7 +33106,7 @@
     1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> j2
     1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> k2
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.Ri:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.mj:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():29:29 -> <clinit>
@@ -32958,7 +33141,7 @@
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
     boolean getInterfaceBit() -> j2
     1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> l2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Xi:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.sj:
     int $r8$clinit -> m
     boolean isInterface -> k
     boolean $assertionsDisabled -> l
@@ -32987,17 +33170,19 @@
     14:14:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127 -> i
     15:23:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:135 -> i
     1:1:boolean getInterfaceBit():52:52 -> j2
-com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.Xi$a:
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.sj$a:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():236:236 -> <clinit>
     1:1:void <init>():236:236 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:2:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):259:260 -> a
     1:2:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1581:1581 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1585:1585 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1581 -> a
     3:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):259 -> a
     3:3:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
     4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1576:1577 -> a
+    4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1585 -> a
     4:5:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1581 -> a
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):259 -> a
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setFreshOutValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory):0 -> a
@@ -33015,7 +33200,7 @@
     9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):254:254 -> b
     9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):264 -> b
     9:9:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):0 -> b
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Yi:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.tj:
     boolean $assertionsDisabled -> m
     boolean isInterface -> l
     1:1:void <clinit>():26:26 -> <clinit>
@@ -33038,7 +33223,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> f2
     1:1:java.lang.String getTypeString():57:57 -> g2
     1:1:boolean getInterfaceBit():37:37 -> j2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Zi:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.vj:
     int $r8$clinit -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
@@ -33054,7 +33239,7 @@
     47:47:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     47:47:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):141 -> a
     48:49:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):141:142 -> a
-    50:50:boolean com.android.tools.r8.graph.DexClass.isFinal():601:601 -> a
+    50:50:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> a
     50:50:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):144 -> a
     51:57:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):144:150 -> a
     58:58:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):156:156 -> a
@@ -33066,7 +33251,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> f2
     1:1:java.lang.String getTypeString():62:62 -> g2
     boolean getInterfaceBit() -> j2
-com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.Zi$a:
+com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.vj$a:
     1:1:void <init>():175:175 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):268:268 -> a
@@ -33079,7 +33264,7 @@
     5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):254:254 -> b
     5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):264 -> b
     5:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):0 -> b
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.Pj:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.lk:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -33095,13 +33280,13 @@
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.so:
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.Po:
     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.So:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.pp:
     java.util.Set seenBlocks -> d
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> c
@@ -33146,7 +33331,7 @@
     1:1:void set(java.lang.Object):21:21 -> set
     2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):266:266 -> set
     2:2:void set(java.lang.Object):21 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.lp:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.Ip:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> N0
     int maxInValueRegister() -> W1
@@ -33167,7 +33352,7 @@
     com.android.tools.r8.ir.code.Load asLoad() -> b0
     1:1:com.android.tools.r8.ir.code.Value src():37:37 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.Tp:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -33200,10 +33385,10 @@
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> c0
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> h2
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.vp:
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.Sp:
     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.Cq:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.ar:
     com.android.tools.r8.ir.code.MemberType CHAR -> c
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> b
     com.android.tools.r8.ir.code.MemberType INT -> e
@@ -33235,7 +33420,7 @@
     28:28:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):82:82 -> a
     28:28:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.zr:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.Sr:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -33267,10 +33452,10 @@
     1:1:boolean isEnter():49:49 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Monitor asMonitor() -> d0
-com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.yr:
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.Rr:
     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.zr$a:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.Sr$a:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> b
@@ -33278,7 +33463,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.Br:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.Ur:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
@@ -33308,7 +33493,7 @@
     1:1:com.android.tools.r8.ir.code.Value src():42:42 -> d2
     com.android.tools.r8.ir.code.Move asMove() -> e0
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.Dr:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.Wr:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
@@ -33335,13 +33520,13 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1859:1859 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1869:1869 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68:68 -> b
     1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.MoveException asMoveException() -> f0
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.Fr:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.Yr:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     int opcode() -> Y1
     double foldDouble(double,double) -> a
@@ -33366,7 +33551,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
     com.android.tools.r8.ir.code.Mul asMul() -> g0
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> h2
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.os:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.Hs:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -33390,10 +33575,10 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
     com.android.tools.r8.ir.code.Neg asNeg() -> h0
-com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.ns:
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.Gs:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():57:57 -> <clinit>
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.ws:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.Ps:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -33424,7 +33609,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> i0
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.xs:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.Qs:
     long size -> i
     short[] data -> j
     int element_width -> h
@@ -33455,7 +33640,7 @@
     1:1:com.android.tools.r8.ir.code.Value src():46:46 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> j0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.ys:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.Rs:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
@@ -33491,9 +33676,9 @@
     1:1:void markNoSpilling():199:199 -> e2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
     1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.Ss:
     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.ct:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.wt:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
@@ -33516,10 +33701,10 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     com.android.tools.r8.ir.code.Not asNot() -> l0
-com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.vt:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():68:68 -> <clinit>
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.kt:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.Et:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
     1:3:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
@@ -33549,15 +33734,15 @@
     247:247:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> m0
-com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.kt$a:
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.Et$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():62:62 -> <clinit>
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.ot:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.It:
     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.st:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.Mt:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
     com.android.tools.r8.ir.code.NumericType LONG -> e
@@ -33584,10 +33769,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.st$a:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.Mt$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():20:20 -> <clinit>
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.Nu:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.hv:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     int opcode() -> Y1
     int foldIntegers(int,int) -> a
@@ -33607,7 +33792,7 @@
     boolean isCommutative() -> d2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> h2
     com.android.tools.r8.ir.code.Or asOr() -> n0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.uv:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.Ov:
     java.util.List operands -> r
     java.util.List definitionUsers -> u
     boolean $assertionsDisabled -> v
@@ -33694,18 +33879,18 @@
     5:5:void removeDeadPhi():324 -> o0
     6:6:void removeDeadPhi():324:324 -> o0
     1:1:boolean removeTrivialPhi():240:240 -> p0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.uv$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.Ov$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
     1:2:void <clinit>():39:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):38:38 -> <init>
-com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.uv$b:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.Ov$b:
     boolean $assertionsDisabled -> w
     1:1:void <clinit>():455:455 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):463:463 -> <init>
     1:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):468:475 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):481:490 -> d
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Ev:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Yv:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value):20:21 -> <init>
@@ -33729,7 +33914,7 @@
     7:7:boolean com.android.tools.r8.ir.code.Instruction.isPop():0:0 -> b
     7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Fv:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Zv:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> h
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -33765,7 +33950,7 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):152:170 -> toString
     1:19:java.lang.String toString():175 -> toString
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.HA:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     1:1:boolean instructionTypeCanThrow():134:134 -> V0
     int opcode() -> Y1
@@ -33795,7 +33980,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> h2
     com.android.tools.r8.ir.code.Rem asRem() -> o0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.EB:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -33814,13 +33999,13 @@
     8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> b
-    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):424:426 -> b
+    24:26:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):447:449 -> b
     24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87 -> b
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():46:47 -> d2
     1:1:boolean isReturnVoid():42:42 -> e2
     1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> f2
     com.android.tools.r8.ir.code.Return asReturn() -> p0
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.MB:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.mC:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> Y1
     int foldIntegers(int,int) -> a
@@ -33840,7 +34025,7 @@
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> h2
     com.android.tools.r8.ir.code.Shl asShl() -> q0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.OB:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.oC:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> Y1
     int foldIntegers(int,int) -> a
@@ -33860,9 +34045,9 @@
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> h2
     com.android.tools.r8.ir.code.Shr asShr() -> r0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.zC:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.BD:
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> r
     boolean $assertionsDisabled -> s
     int height -> q
@@ -33875,7 +34060,7 @@
     1:1:int getHeight():31:31 -> k0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> l0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.bD:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.CD:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():14:14 -> <clinit>
@@ -33886,53 +34071,62 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> k0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> y
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.MD:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
+    int $r8$clinit -> 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>
     boolean instructionTypeCanBeCanonicalized() -> U0
     boolean instructionTypeCanThrow() -> V0
     int maxInValueRegister() -> W1
     int maxOutValueRegister() -> X1
     int opcode() -> Y1
-    1:2:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):41:42 -> a
-    3:4:com.android.tools.r8.ir.code.StaticGet com.android.tools.r8.ir.code.StaticGet.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StaticGet):47:48 -> a
-    3:4:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):43 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.StaticGet.dest():62:62 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96 -> a
-    6:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:123 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):120:120 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117:117 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):114:114 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:111 -> a
-    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):108:108 -> a
-    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:105 -> a
-    40:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:125 -> a
-    65:79:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):72:86 -> a
-    80:86:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):84:90 -> a
-    87:87:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:147 -> a
-    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):172:172 -> a
-    89:89:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):197:197 -> a
-    90:93:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):202:202 -> a
-    94:94:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):209:209 -> a
-    95:95:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):214:214 -> a
-    96:96:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):224:224 -> a
-    97:97:boolean outTypeKnownToBeBoolean(java.util.Set):230:230 -> a
+    1:2:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):46:47 -> a
+    3:4:com.android.tools.r8.ir.code.StaticGet com.android.tools.r8.ir.code.StaticGet.copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StaticGet):52:53 -> a
+    3:4:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):48 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.StaticGet.dest():67:67 -> a
+    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101 -> a
+    6:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:128 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):125:125 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):122:122 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):119:119 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:116 -> a
+    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:113 -> a
+    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):110:110 -> a
+    40:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):106:130 -> a
+    65:79:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):77:91 -> a
+    80:86:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):89:95 -> a
+    87:87:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):152:152 -> a
+    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):177:177 -> a
+    89:89:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):202:202 -> a
+    90:93:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):207:207 -> a
+    94:94:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):214:214 -> a
+    95:95:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):219:219 -> a
+    96:96: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):229:229 -> a
+    97:97:boolean outTypeKnownToBeBoolean(java.util.Set):235:235 -> a
     98:98:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticGet):314:314 -> a
-    98:98:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):58 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):162:162 -> b
+    98:98:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):63 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):167:167 -> 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):162 -> b
-    3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):165:166 -> b
-    1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> 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):147:147 -> c
-    2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> c
-    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):235:243 -> d
-    1:1:com.android.tools.r8.ir.code.Value value():67:67 -> e2
-    1:1:com.android.tools.r8.ir.code.Value dest():62:62 -> f2
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):167 -> b
+    3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):170:171 -> b
+    1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146:146 -> 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):152:152 -> c
+    2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146 -> c
+    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):240:248 -> d
+    1:1:com.android.tools.r8.ir.code.Value value():72:72 -> e2
+    1:1:com.android.tools.r8.ir.code.Value dest():67:67 -> f2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> s0
-    1:1:java.lang.String toString():177:177 -> toString
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.nD:
+    1:1:java.lang.String toString():182:182 -> toString
+com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.MD$a:
+    com.android.tools.r8.graph.DexField field -> c
+    1:1:void <init>():252:252 -> <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):261:261 -> a
+    1:1:com.android.tools.r8.ir.code.StaticGet build():267:267 -> b
+    2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1569:1570 -> b
+    2:3:com.android.tools.r8.ir.code.StaticGet build():267 -> b
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.OD:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):36:36 -> <init>
@@ -33965,7 +34159,7 @@
     1:2:com.android.tools.r8.ir.code.Value value():51:52 -> e2
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> t0
     1:1:java.lang.String toString():179:179 -> toString
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.QD:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):25:25 -> <init>
@@ -33990,7 +34184,7 @@
     1:1:com.android.tools.r8.ir.code.Value src():39:39 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Store asStore() -> u0
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.JD:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.kE:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():17:17 -> <clinit>
@@ -34015,7 +34209,7 @@
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> v0
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.gE:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.IE:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
@@ -34050,7 +34244,7 @@
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> h2
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
     com.android.tools.r8.ir.code.Sub asSub() -> w0
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.oE:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.QE:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
@@ -34071,7 +34265,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.pE:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.RE:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
@@ -34097,7 +34291,7 @@
     5:5:boolean valid():29:29 -> g2
     1:1:com.android.tools.r8.ir.code.Value value():24:24 -> h2
     com.android.tools.r8.ir.code.Switch asSwitch() -> x0
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.LE:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.nF:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -34117,17 +34311,17 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
     1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> d2
     com.android.tools.r8.ir.code.Throw asThrow() -> y0
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.tF:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.UF:
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> a
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):16:16 -> a
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> f
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.sF:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.TF:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> b
     com.android.tools.r8.graph.DebugLocalInfo val$local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeElement):16:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():25:25 -> a
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> f
-com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.RF:
+com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.rG:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):29:29 -> <init>
     boolean hasInvariantOutType() -> N0
     int maxInValueRegister() -> W1
@@ -34141,7 +34335,7 @@
     5:5:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:85 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.dG:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.DG:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> N0
     boolean isUnop() -> V1
@@ -34154,7 +34348,7 @@
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.kG:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.GG:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> Y1
     int foldIntegers(int,int) -> a
@@ -34174,7 +34368,7 @@
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> h2
     com.android.tools.r8.ir.code.Ushr asUshr() -> z0
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.pG:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.LG:
     boolean $assertionsDisabled -> p
     int needsRegister -> j
     boolean isThis -> k
@@ -34398,14 +34592,14 @@
     1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():316 -> x
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1073:1073 -> y
     1:11:com.android.tools.r8.utils.LongInterval getValueRange():939:949 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.pG$a:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.LG$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):156:156 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):154:157 -> <init>
-com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.qG:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.MG:
     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.wG:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.SG:
     com.android.tools.r8.ir.code.ValueType DOUBLE -> e
     com.android.tools.r8.ir.code.ValueType FLOAT -> c
     com.android.tools.r8.ir.code.ValueType LONG -> d
@@ -34457,14 +34651,14 @@
     1:1:com.android.tools.r8.ir.code.ValueType[] values():16:16 -> e
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
-com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.wG$a:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.SG$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():142:142 -> <clinit>
     2:2:void <clinit>():105:105 -> <clinit>
     3:3:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.xG:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.TG:
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> a
@@ -34513,7 +34707,7 @@
     79:79:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:int requiredRegisters():42:42 -> b
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint[] values():13:13 -> c
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.xG$a:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.TG$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueTypeConstraint -> d
@@ -34522,9 +34716,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.PG:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.lH:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.aI:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.yI:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     com.android.tools.r8.ir.code.Xor asXor() -> A0
     int opcode() -> Y1
@@ -34849,7 +35043,7 @@
     boolean hasDoubleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():32:32 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.R3:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.Q3:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -35037,8 +35231,8 @@
     21:26:void updateLocals(com.android.tools.r8.cf.code.CfLabel):552:557 -> b
     27:27:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):668:668 -> b
     28:28:int getLocalRegister(com.android.tools.r8.ir.code.Value):672:672 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.P3:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.Q3:
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.O3:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.P3:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
@@ -35046,7 +35240,7 @@
     1:3:void <init>():106:108 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):106:106 -> <init>
     1:3:void push(com.android.tools.r8.ir.code.Value):115:117 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.f5:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.e5:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -35072,176 +35266,176 @@
     com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList cachedTryHandlerList -> m
     1:1:void <clinit>():60:60 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.CfCode,java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.AppView):232:232 -> <init>
-    2:194:void <init>(com.android.tools.r8.graph.CfCode,java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.AppView):63:255 -> <init>
+    2:199:void <init>(com.android.tools.r8.graph.CfCode,java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.AppView):63:260 -> <init>
     void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):298:301 -> a
-    5:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):300:308 -> a
+    1:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):303:306 -> a
+    5:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305:313 -> a
     14:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
     14:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):308 -> a
-    15:33:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):308:326 -> a
-    34:34:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):333:333 -> a
+    14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):313 -> a
+    15:33:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):313:331 -> a
+    34:34:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):338:338 -> a
     35:35:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.validFor(int):85:85 -> a
-    35:35:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):333 -> a
-    36:39:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):334:337 -> a
-    40:40:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):335:335 -> a
+    35:35:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):338 -> a
+    36:39:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):339:342 -> a
+    40:40:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340:340 -> a
     41:42:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):101:102 -> a
-    41:42:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):335 -> a
+    41:42:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
     43:43:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
     43:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):102 -> a
-    43:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):335 -> a
+    43:43:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
     44:44:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):103:103 -> a
-    44:44:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):335 -> a
+    44:44:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
     45:45:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.<init>():104:104 -> a
     45:45:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):103 -> a
-    45:45:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):335 -> a
+    45:45:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
     46:74:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):105:133 -> a
-    46:74:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):335 -> a
-    75:82:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):335:342 -> a
-    83:83:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():415:415 -> a
-    83:83:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):746 -> a
-    84:84:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):749:749 -> a
-    85:85:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.CfSourceCode.getIncomingLocal(int):741:741 -> a
-    85:85:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):750 -> a
-    86:88:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):752:754 -> a
-    89:94:void com.android.tools.r8.ir.conversion.CfSourceCode.buildExceptionalExitMethodSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):440:445 -> a
-    89:94:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):504 -> a
-    95:106:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):507:518 -> a
-    107:119:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):515:527 -> a
+    46:74:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340 -> a
+    75:82:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):340:347 -> a
+    83:83:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> a
+    83:83:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):751 -> a
+    84:84:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):754:754 -> a
+    85:85:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.CfSourceCode.getIncomingLocal(int):746:746 -> a
+    85:85:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):755 -> a
+    86:88:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):757:759 -> a
+    89:94:void com.android.tools.r8.ir.conversion.CfSourceCode.buildExceptionalExitMethodSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):445:450 -> a
+    89:94:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):509 -> a
+    95:106:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):512:523 -> a
+    107:119:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):520:532 -> a
     120:122:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState$Snapshot.exceptionTransfer(com.android.tools.r8.graph.DexType):326:328 -> a
-    120:122:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):527 -> a
-    123:133:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):528:538 -> a
-    134:137:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):775:778 -> a
-    134:137:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):557 -> a
-    138:150:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):540:552 -> a
-    151:151:void com.android.tools.r8.ir.conversion.CfSourceCode.build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):576:576 -> a
-    151:151:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):560 -> a
-    152:158:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):562:568 -> a
-    159:164:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):784:789 -> a
-    159:164:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    165:177:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):801:813 -> a
-    165:177:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):791 -> a
-    165:177:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    178:178:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):811:811 -> a
-    178:178:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):791 -> a
-    178:178:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    179:179:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):809:809 -> a
-    179:179:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):791 -> a
-    179:179:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    180:180:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):807:807 -> a
-    180:180:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):791 -> a
-    180:180:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    181:181:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):805:805 -> a
-    181:181:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):791 -> a
-    181:181:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    182:182:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):803:803 -> a
-    182:182:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):791 -> a
-    182:182:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    183:187:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):791:795 -> a
-    183:187:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):571 -> a
-    188:191:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):450:453 -> a
-    192:194:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):466:466 -> a
-    198:222:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):470:494 -> a
-    223:224:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):580:581 -> a
+    120:122:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):532 -> a
+    123:133:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):533:543 -> a
+    134:137:void com.android.tools.r8.ir.conversion.CfSourceCode.endLocals(com.android.tools.r8.ir.conversion.IRBuilder):780:783 -> a
+    134:137:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):562 -> a
+    138:150:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):545:557 -> a
+    151:151:void com.android.tools.r8.ir.conversion.CfSourceCode.build(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.conversion.IRBuilder):581:581 -> a
+    151:151:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):565 -> a
+    152:158:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):567:573 -> a
+    159:164:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):789:794 -> a
+    159:164:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    165:177:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):806:818 -> a
+    165:177:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    165:177:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    178:178:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):816:816 -> a
+    178:178:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    178:178:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    179:179:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):814:814 -> a
+    179:179:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    179:179:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    180:180:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):812:812 -> a
+    180:180:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    180:180:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    181:181:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):810:810 -> a
+    181:181:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    181:181:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    182:182:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode.prettyType(com.android.tools.r8.ir.code.ValueType):808:808 -> a
+    182:182:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796 -> a
+    182:182:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    183:187:void com.android.tools.r8.ir.conversion.CfSourceCode.startLocals(com.android.tools.r8.ir.conversion.IRBuilder):796:800 -> a
+    183:187:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):576 -> a
+    188:191:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):455:458 -> a
+    192:194:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):471:471 -> a
+    198:222:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):475:499 -> a
+    223:224:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):585:586 -> a
     225:229:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):122:126 -> a
-    225:229:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):581 -> a
+    225:229:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
     230:245:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):130:145 -> a
     230:245:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    230:245:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):581 -> a
+    230:245:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
     246:246:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     246:246:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145 -> a
     246:246:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    246:246:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):581 -> a
+    246:246:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
     247:247:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):145:145 -> a
     247:247:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    247:247:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):581 -> a
-    248:248:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):583:583 -> a
+    247:247:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    248:248:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):588:588 -> a
     249:249:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
     249:249:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    249:249:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):581 -> a
+    249:249:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
     250:250:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     250:250:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131 -> a
     250:250:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    250:250:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):581 -> a
+    250:250:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
     251:251:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.origin.Origin):131:131 -> a
     251:251:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.origin.Origin):126 -> a
-    251:251:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):581 -> a
-    252:253:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):592:593 -> a
-    254:267:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):597:610 -> a
-    268:271:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):609:612 -> a
-    272:274:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():619:621 -> a
-    272:274:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):613 -> a
+    251:251:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):586 -> a
+    252:253:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):597:598 -> a
+    254:267:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):602:615 -> a
+    268:271:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):614:617 -> a
+    272:274:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():624:626 -> a
+    272:274:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
     275:275:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    275:275:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():621 -> a
-    275:275:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):613 -> a
+    275:275:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():626 -> a
+    275:275:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
     276:276:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    276:276:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():621 -> a
-    276:276:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):613 -> a
-    277:277:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):614:614 -> a
-    278:301:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):630:653 -> a
-    302:302:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):667:667 -> a
-    303:304:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):673:674 -> a
+    276:276:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isFirstFrameInBlock():626 -> a
+    276:276:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):618 -> a
+    277:277:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):619:619 -> a
+    278:301:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.CfFrame$FrameType):635:658 -> a
+    302:302:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):672:672 -> a
+    303:304:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):678:679 -> a
     305:305:boolean com.android.tools.r8.graph.CfCode$StackMapStatus.isInvalidOrNotPresent():79:79 -> a
-    305:305:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):674 -> a
-    306:314:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):678:686 -> a
-    315:331:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):683:699 -> a
-    332:332:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.CfSourceCode.getIncomingLocalAtBlock(int,int):667:667 -> a
-    332:332:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):700 -> a
-    333:367:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):702:736 -> a
-    368:369:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):818:819 -> a
-    370:370:boolean hasValidTypesFromStackMap():856:856 -> a
-    371:377:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):893:893 -> a
+    305:305:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):679 -> a
+    306:314:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):683:691 -> a
+    315:331:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):688:704 -> a
+    332:332:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.CfSourceCode.getIncomingLocalAtBlock(int,int):672:672 -> a
+    332:332:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):705 -> a
+    333:367:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):707:741 -> a
+    368:369:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):823:824 -> a
+    370:370:boolean hasValidTypesFromStackMap():861:861 -> a
+    371:377:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):898:898 -> a
     void setUp() -> b
-    1:1:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():415:415 -> b
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):826 -> b
-    2:4:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):829:831 -> b
-    5:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):830:835 -> b
-    11:19:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):862:862 -> b
-    28:41:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):871:884 -> b
-    42:42:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):866:866 -> b
-    1:25:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):383:407 -> c
-    26:39:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):423:436 -> c
-    26:39:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):408 -> c
-    40:41:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410:411 -> c
-    42:42:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():415:415 -> c
-    42:42:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):741 -> c
-    43:43:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):741:741 -> c
-    44:44:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():415:415 -> c
-    44:44:boolean verifyCurrentInstructionCanThrow():845 -> c
-    45:46:boolean verifyCurrentInstructionCanThrow():845:846 -> c
-    47:47:com.android.tools.r8.ir.code.Position lambda$getCanonicalDebugPositionAtOffset$1(com.android.tools.r8.cf.code.CfInstruction):867:867 -> c
+    1:1:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> b
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):831 -> b
+    2:4:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):834:836 -> b
+    5:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):835:840 -> b
+    11:19:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):867:867 -> b
+    28:41:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):876:889 -> b
+    42:42:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):871:871 -> b
+    1:25:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):388:412 -> c
+    26:39:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):428:441 -> c
+    26:39:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):413 -> c
+    40:41:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):415:416 -> c
+    42:42:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> c
+    42:42:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):746 -> c
+    43:43:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):746:746 -> c
+    44:44:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> c
+    44:44:boolean verifyCurrentInstructionCanThrow():850 -> c
+    45:46:boolean verifyCurrentInstructionCanThrow():850:851 -> c
+    47:47:com.android.tools.r8.ir.code.Position lambda$getCanonicalDebugPositionAtOffset$1(com.android.tools.r8.cf.code.CfInstruction):872:872 -> c
     int getMoveExceptionRegister(int) -> d
-    1:1:int instructionCount():272:272 -> d
+    1:1:int instructionCount():277:277 -> d
     int instructionOffset(int) -> e
-    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():889:889 -> e
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():894:894 -> e
     boolean verifyRegister(int) -> f
-    1:1:int getCurrentInstructionIndex():588:588 -> f
+    1:1:int getCurrentInstructionIndex():593:593 -> f
     int instructionIndex(int) -> g
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():259:259 -> g
-    1:1:com.android.tools.r8.origin.Origin getOrigin():263:263 -> h
-    2:2:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):346:346 -> h
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():264:264 -> g
+    1:1:com.android.tools.r8.origin.Origin getOrigin():268:268 -> h
+    2:2:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):351:351 -> h
     3:3:boolean com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList.validFor(int):180:180 -> h
-    3:3:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):346 -> h
-    4:7:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):347:350 -> h
-    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():267:267 -> i
-    2:26:int[] getTargets(int):354:378 -> i
-    27:28:int[] getTargets(int):358:359 -> i
-    1:1:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():868:868 -> j
-    2:5:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():865:868 -> j
-    1:1:boolean localsChanged():771:771 -> k
-    1:10:void setLocalVariableLists():758:767 -> l
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.c5:
+    3:3:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):351 -> h
+    4:7:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):352:355 -> h
+    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():272:272 -> i
+    2:26:int[] getTargets(int):359:383 -> i
+    27:28:int[] getTargets(int):363:364 -> i
+    1:1:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():873:873 -> j
+    2:5:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():870:873 -> j
+    1:1:boolean localsChanged():776:776 -> k
+    1:10:void setLocalVariableLists():763:772 -> l
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.b5:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
-    1:1:void <clinit>():801:801 -> <clinit>
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.d5:
+    1:1:void <clinit>():806:806 -> <clinit>
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.c5:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap locals -> c
     int endOffset -> b
     int startOffset -> a
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):145:148 -> <init>
     1:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):158:176 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.e5:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.d5:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -35250,13 +35444,13 @@
     1:1:void <clinit>():70:70 -> <clinit>
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):77:81 -> <init>
     1:2:boolean isEmpty():89:90 -> a
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.g5:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.f5:
     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.m5:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.l5:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -35290,8 +35484,8 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():201:201 -> c
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot pop():187:188 -> d
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.i5:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.j5:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.h5:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.i5:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -35314,7 +35508,7 @@
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():390:390 -> c
     1:1:int stackHeight():374:374 -> d
     1:15:java.lang.String toString():419:433 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.k5:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.j5:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():476:476 -> <clinit>
@@ -35323,7 +35517,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.l5:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.k5:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():437:437 -> <clinit>
@@ -35350,7 +35544,7 @@
     2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
     2:2:int stackHeight():449 -> d
     1:1:java.lang.String toString():472:472 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.m5$a:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.l5$a:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -35367,24 +35561,24 @@
     6:6:boolean com.android.tools.r8.ir.conversion.CfState$SlotType.isPrecise():0:0 -> a
     6:6:boolean isPrecise():284 -> a
     1:3:java.lang.String toString():270:272 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.p5:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.o5:
     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.n5:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.m5:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):56:57 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():67:67 -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.o5:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.n5:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):27:28 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():38:38 -> a
     1:1:com.android.tools.r8.graph.DexType getPrecise():33:33 -> b
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.q5:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.p5:
     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>
@@ -35396,7 +35590,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.r5:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.q5:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():508:508 -> <clinit>
@@ -35434,18 +35628,18 @@
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):145:145 -> <init>
     1:5:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):157:161 -> a
     6:6:void notifyAllClassesConverted():167:167 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.c6:
+com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.d6:
     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$1 -> com.android.tools.r8.internal.a6:
-com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.ir.conversion.ClassConverterResult$1 -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.c6:
     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.CodeOptimization -> com.android.tools.r8.internal.J7:
+com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.internal.K7:
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
 com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.ir.conversion.j:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> f
@@ -35465,14 +35659,14 @@
     11:11:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():119:119 -> a
     12:17:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142:142 -> a
     1:2:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):72:73 -> b
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):218:218 -> b
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):227:227 -> b
     3:3:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):73 -> b
     4:4:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):77:77 -> b
     5:5:java.util.concurrent.Future com.android.tools.r8.utils.ThreadUtils.processAsynchronously(java.util.concurrent.Callable,java.util.concurrent.ExecutorService):24:24 -> b
     5:5:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):78 -> b
     6:6:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):77:77 -> b
     7:8:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):93:94 -> b
-    9:9:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):218:218 -> b
+    9:9:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):227:227 -> b
     9:9:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):94 -> b
     10:13:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):98:101 -> b
     14:14:java.util.concurrent.Future com.android.tools.r8.utils.ThreadUtils.processAsynchronously(java.util.concurrent.Callable,java.util.concurrent.ExecutorService):24:24 -> b
@@ -35488,7 +35682,7 @@
     9:9:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.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):1086:1086 -> d
     9:9:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):104 -> d
     1:2:boolean verifyNoPendingMethodProcessing():150:151 -> e
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.pa:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.qa:
     boolean hasBackwardsBranch -> m
     int outRegisterCount -> l
     boolean $assertionsDisabled -> o
@@ -35565,7 +35759,7 @@
     196:199:void com.android.tools.r8.ir.conversion.DexBuilder.reset():164:167 -> a
     196:199:com.android.tools.r8.graph.DexCode build():190 -> a
     200:241:com.android.tools.r8.graph.DexCode build():195:236 -> a
-    242:242:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1795:1795 -> a
+    242:242:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1805:1805 -> a
     242:242:com.android.tools.r8.graph.DexCode build():236 -> a
     243:286:com.android.tools.r8.graph.DexCode build():237:280 -> a
     287:306:com.android.tools.r8.code.Nop com.android.tools.r8.ir.conversion.DexBuilder.createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710:729 -> a
@@ -35619,10 +35813,10 @@
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):664:664 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():877:877 -> c
     1:1:boolean isBuildingForComparison():155:155 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.ea:
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.fa:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():1275:1275 -> <clinit>
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.fa:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.ga:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1046:1046 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -35630,11 +35824,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.ha:
     com.android.tools.r8.code.FillArrayData dex -> b
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
     1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1521:1523 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.ia:
     com.android.tools.r8.code.Instruction instruction -> e
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):953:954 -> <init>
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):974:975 -> a
@@ -35643,7 +35837,7 @@
     1:1:int getSize():959:959 -> d
     1:1:int maxSize():969:969 -> e
     1:1:int minSize():964:964 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.ia:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.ja:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1079:1079 -> <clinit>
@@ -35662,7 +35856,7 @@
     1:2:int getSize():1093:1094 -> d
     1:1:int maxSize():1105:1105 -> e
     1:1:int minSize():1099:1099 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.ja:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.ka:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1210:1210 -> <clinit>
@@ -35778,7 +35972,7 @@
     1:1:int getSize():1343:1343 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.ka:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.la:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -35798,7 +35992,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.la:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.ma:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1357:1357 -> <clinit>
@@ -35845,7 +36039,7 @@
     1:2:int getSize():1469:1470 -> d
     1:1:int maxSize():1463:1463 -> e
     1:1:int minSize():1457:1457 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.ma:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.na:
     int size -> f
     com.android.tools.r8.code.Instruction[] instructions -> e
     1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):997:1003 -> <init>
@@ -35855,11 +36049,11 @@
     1:1:int getSize():1033:1033 -> d
     1:1:int maxSize():1028:1028 -> e
     1:1:int minSize():1023:1023 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.na:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.oa:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1510:1512 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.oa:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.pa:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
@@ -35868,7 +36062,7 @@
     1:1:int compareTo(java.lang.Object):1487:1487 -> compareTo
     2:2:int com.android.tools.r8.ir.conversion.DexBuilder$TryItem.compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1501:1501 -> compareTo
     2:2:int compareTo(java.lang.Object):1487 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Ba:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Ca:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
     com.android.tools.r8.graph.DexMethod originalMethod -> l
@@ -35884,89 +36078,89 @@
     java.util.List debugEntries -> k
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):78:78 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):60:89 -> <init>
+    2:33:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):60:91 -> <init>
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void doNothingWriteConsumer(java.lang.Integer,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):164:164 -> a
-    2:2:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):276:276 -> a
-    2:2:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):209 -> a
-    2:2:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):164 -> a
-    3:11:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):209:217 -> a
-    3:11:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):164 -> a
-    12:12:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):235:235 -> a
-    12:12:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165 -> a
-    13:13:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):276:276 -> a
-    13:13:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):238 -> a
-    13:13:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165 -> a
-    14:20:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):239:245 -> a
-    14:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165 -> a
-    21:22:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):166:167 -> a
-    23:25:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):252:252 -> a
-    28:34:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):255:255 -> a
-    35:37:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):282:282 -> a
-    38:42:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):289:289 -> a
-    43:43:boolean isMoveResult(com.android.tools.r8.code.Instruction):315:315 -> a
-    44:76:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):322:354 -> a
-    77:77:java.util.Set com.android.tools.r8.ir.conversion.DexSourceCode.getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):429:429 -> a
-    77:77:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):354 -> a
-    78:83:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):354:359 -> a
-    84:84:boolean com.android.tools.r8.ir.conversion.DexSourceCode.isInvoke(com.android.tools.r8.code.Instruction):296:296 -> a
-    84:84:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359 -> a
-    85:102:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359:376 -> a
+    1:1:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165:165 -> a
+    2:2:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):277:277 -> a
+    2:2:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):210 -> a
+    2:2:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165 -> a
+    3:11:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):210:218 -> a
+    3:11:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165 -> a
+    12:12:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):236:236 -> a
+    12:12:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):166 -> a
+    13:13:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):277:277 -> a
+    13:13:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):239 -> a
+    13:13:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):166 -> a
+    14:20:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):240:246 -> a
+    14:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):166 -> a
+    21:22:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):167:168 -> a
+    23:25:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):253:253 -> a
+    28:34:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):256:256 -> a
+    35:37:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):283:283 -> a
+    38:42:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):290:290 -> a
+    43:43:boolean isMoveResult(com.android.tools.r8.code.Instruction):316:316 -> a
+    44:76:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):323:355 -> a
+    77:77:java.util.Set com.android.tools.r8.ir.conversion.DexSourceCode.getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
+    77:77:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):355 -> a
+    78:83:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):355:360 -> a
+    84:84:boolean com.android.tools.r8.ir.conversion.DexSourceCode.isInvoke(com.android.tools.r8.code.Instruction):297:297 -> a
+    84:84:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):360 -> a
+    85:102:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):360:377 -> a
     103:104:int[] com.android.tools.r8.ir.conversion.SwitchPayloadResolver.absoluteTargets(com.android.tools.r8.code.Instruction):63:64 -> a
-    103:104:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):376 -> a
-    105:108:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):376:379 -> a
-    109:118:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):401:410 -> a
-    119:120:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):407:408 -> a
-    121:129:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):415:423 -> a
-    130:131:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):433:434 -> a
-    132:132:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):434:434 -> a
-    1:8:void setUp():121:128 -> b
-    9:9:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):172:172 -> b
-    10:13:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):187:190 -> b
+    103:104:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):377 -> a
+    105:108:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):377:380 -> a
+    109:118:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):402:411 -> a
+    119:120:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):408:409 -> a
+    121:129:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):416:424 -> a
+    130:131:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):434:435 -> a
+    132:132:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):435:435 -> a
+    1:8:void setUp():122:129 -> b
+    9:9:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):173:173 -> b
+    10:13:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):188:191 -> b
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> c
-    1:7:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):136:142 -> c
-    8:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):140:140 -> c
-    9:9:boolean verifyCurrentInstructionCanThrow():200:200 -> c
-    1:2:void clear():265:266 -> clear
-    1:1:int instructionCount():100:100 -> d
-    2:5:int getMoveExceptionRegister(int):177:180 -> d
-    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():195:195 -> e
-    2:2:int instructionOffset(int):276:276 -> e
-    1:1:boolean verifyRegister(int):95:95 -> f
-    1:1:int instructionIndex(int):271:271 -> g
-    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):223:225 -> h
-    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):392:392 -> i
-    2:2:boolean com.android.tools.r8.ir.conversion.DexSourceCode.inTryRange(com.android.tools.r8.graph.DexCode$Try,int):387:387 -> i
-    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):393 -> i
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.fc:
+    1:7:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):137:143 -> c
+    8:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):141:141 -> c
+    9:9:boolean verifyCurrentInstructionCanThrow():201:201 -> c
+    1:2:void clear():266:267 -> clear
+    1:1:int instructionCount():101:101 -> d
+    2:5:int getMoveExceptionRegister(int):178:181 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():196:196 -> e
+    2:2:int instructionOffset(int):277:277 -> e
+    1:1:boolean verifyRegister(int):96:96 -> f
+    1:1:int instructionIndex(int):272:272 -> g
+    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):224:226 -> h
+    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):393:393 -> i
+    2:2:boolean com.android.tools.r8.ir.conversion.DexSourceCode.inTryRange(com.android.tools.r8.graph.DexCode$Try,int):388:388 -> i
+    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):394 -> i
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.gc:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(long):15:16 -> <init>
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):21:22 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):27:27 -> a
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.hc:
     1:1:void <init>():12:12 -> <init>
     com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.hc:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.ic:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):17:17 -> a
     2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22:22 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22 -> a
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Cc:
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField) -> a
     void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.we:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.Re:
     java.util.Queue ssaWorklist -> f
     com.android.tools.r8.origin.Origin origin -> p
     int currentInstructionOffset -> j
@@ -36016,14 +36210,14 @@
     50:57:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):531:538 -> a
     58:61:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):980:983 -> a
     58:61:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):539 -> a
-    62:62:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> a
+    62:62:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2348:2348 -> a
     62:62:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):988 -> a
     62:62:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):984 -> a
     62:62:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):539 -> a
     63:64:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):989:990 -> a
     63:64:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):984 -> a
     63:64:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):539 -> a
-    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):990 -> a
     65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):984 -> a
     65:65:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):539 -> a
@@ -36035,7 +36229,7 @@
     84:87:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1029:1032 -> a
     84:87:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1024 -> a
     84:87:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):560 -> a
-    88:88:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> a
+    88:88:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2348:2348 -> a
     88:88:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1034 -> a
     88:88:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1024 -> a
     88:88:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):560 -> a
@@ -36048,15 +36242,15 @@
     126:127:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):594 -> a
     128:132:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):596:600 -> a
     133:151:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):610:628 -> a
-    152:154:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2541:2543 -> a
+    152:154:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2527:2529 -> a
     152:154:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):633 -> a
-    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2551:2552 -> a
-    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2546 -> a
+    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2537:2538 -> a
+    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2532 -> a
     155:156:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):633 -> a
-    157:157:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2547:2547 -> a
+    157:157:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2533:2533 -> a
     157:157:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):633 -> a
     158:168:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):634:644 -> a
-    169:169:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2572:2572 -> a
+    169:169:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2558:2558 -> a
     169:169:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):645 -> a
     170:172:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):651:653 -> a
     173:173:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):526:526 -> a
@@ -36079,12 +36273,12 @@
     223:230:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
     231:241:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():894:904 -> a
     231:241:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    242:242:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    242:242:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     242:242:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():904 -> a
     242:242:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
     243:252:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():908:917 -> a
     243:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    253:256:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2617:2620 -> a
+    253:256:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2603:2606 -> a
     253:256:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():917 -> a
     253:256:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
     257:258:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():920:921 -> a
@@ -36166,26 +36360,26 @@
     335:335:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
     335:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):685 -> a
     336:337:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):692:693 -> a
-    338:368:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2705:2735 -> a
+    338:368:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2691:2721 -> a
     338:368:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
     369:369:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1563:1563 -> a
-    369:369:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2735 -> a
+    369:369:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2721 -> a
     369:369:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    370:370:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2735:2735 -> a
+    370:370:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2721:2721 -> a
     370:370:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    371:385:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2734:2748 -> a
+    371:385:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2720:2734 -> a
     371:385:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
     386:397:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):553:564 -> a
-    386:397:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2752 -> a
+    386:397:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2738 -> a
     386:397:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    398:398:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2753:2753 -> a
+    398:398:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2739:2739 -> a
     398:398:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    399:399:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2711:2711 -> a
+    399:399:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2697:2697 -> a
     399:399:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
     400:400:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    400:400:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2711 -> a
+    400:400:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2697 -> a
     400:400:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    401:445:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2711:2755 -> a
+    401:445:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2697:2741 -> a
     401:445:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
     446:460:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):701:715 -> a
     461:461:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1212:1212 -> a
@@ -36199,7 +36393,7 @@
     480:480:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729 -> a
     481:481:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
     482:505:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):724:747 -> a
-    506:506:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1529:1529 -> a
+    506:506:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1539:1539 -> a
     506:506:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):747 -> a
     507:507:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):748:748 -> a
     508:519:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):127:138 -> a
@@ -36235,10 +36429,10 @@
     550:550:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):774:774 -> a
     551:551:void resolveAndBuildSwitch(int,int,int):961:961 -> a
     552:552:void add(com.android.tools.r8.ir.code.Instruction):975:975 -> a
-    553:553:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    553:553:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     553:553:void add(com.android.tools.r8.ir.code.Instruction):976 -> a
     554:555:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1016:1017 -> a
-    556:556:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    556:556:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     556:556:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1019 -> a
     557:557:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1020:1020 -> a
     558:562:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1075:1079 -> a
@@ -36253,10 +36447,10 @@
     565:565:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1080 -> a
     566:566:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1081:1081 -> a
     567:573:void addDebugPosition(com.android.tools.r8.ir.code.Position):1086:1092 -> a
-    574:574:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    574:574:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     574:574:void addDebugPosition(com.android.tools.r8.ir.code.Position):1092 -> a
     575:579:void addDebugPosition(com.android.tools.r8.ir.code.Position):1099:1103 -> a
-    580:580:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    580:580:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     580:580:void addDebugPosition(com.android.tools.r8.ir.code.Position):1103 -> a
     581:590:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1147:1156 -> a
     591:591:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
@@ -36277,17 +36471,17 @@
     653:655:void addConstString(int,com.android.tools.r8.graph.DexString):1279:1281 -> a
     656:658:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1316:1318 -> a
     659:660:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1327:1328 -> a
-    661:661:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> a
+    661:661:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2348:2348 -> a
     661:661:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1330 -> a
     662:664:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1331:1333 -> a
-    665:665:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    665:665:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     665:665:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1333 -> a
     666:667:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1338:1339 -> a
-    668:668:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    668:668:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     668:668:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1339 -> a
     669:669:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1342:1342 -> a
     670:671:void addNop():1368:1369 -> a
-    672:672:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    672:672:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     672:672:void addNop():1369 -> a
     673:679:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1448:1454 -> a
     680:680:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1462:1462 -> a
@@ -36296,254 +36490,254 @@
     685:688:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1475:1478 -> a
     689:693:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1483:1487 -> a
     694:699:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1485:1490 -> a
-    700:700:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    700:700:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     700:700:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1491 -> a
     701:704:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1495:1498 -> a
-    705:705:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
+    705:705:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
     705:705:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1499 -> a
     706:715:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1511:1520 -> a
-    716:742:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1514:1540 -> a
-    743:747:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1550:1554 -> a
-    748:751:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1553:1556 -> a
-    752:769:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1583:1600 -> a
-    770:774:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1605:1609 -> a
-    775:778:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1608:1611 -> a
-    779:802:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1622:1645 -> a
-    803:819:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1649:1665 -> a
-    820:844:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1686:1710 -> a
-    845:859:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1714:1728 -> a
-    860:860:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1741:1741 -> a
-    861:861:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    861:861:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1741 -> a
-    862:865:void addNewArrayFilledData(int,int,long,short[]):1812:1815 -> a
-    866:866:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
-    866:866:void addNewArrayFilledData(int,int,long,short[]):1816 -> a
-    867:870:void addStaticGet(int,com.android.tools.r8.graph.DexField):1862:1865 -> a
-    871:876:void addStaticGet(int,com.android.tools.r8.graph.DexField):1863:1868 -> a
-    877:877:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
-    877:877:void addStaticGet(int,com.android.tools.r8.graph.DexField):1869 -> a
-    878:921:void addSwitch(int,int[],int,int[]):1901:1944 -> a
-    922:922:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    922:922:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    922:922:void addSwitch(int,int[],int,int[]):1949 -> a
-    923:923:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    923:923:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    923:923:void addSwitch(int,int[],int,int[]):1950 -> a
-    924:928:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1957:1961 -> a
-    924:928:void addSwitch(int,int[],int,int[]):1951 -> a
-    929:929:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2590:2590 -> a
-    929:929:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1963 -> a
-    929:929:void addSwitch(int,int[],int,int[]):1951 -> a
-    930:953:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1964:1987 -> a
-    930:953:void addSwitch(int,int[],int,int[]):1951 -> a
-    954:954:void addSwitch(int,int[],int,int[]):1952:1952 -> a
-    955:956:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2157:2158 -> a
-    957:976:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2173:2192 -> a
-    957:976:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    977:987:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2264:2274 -> a
-    977:987:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    977:987:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    988:988:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    988:988:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2274 -> a
-    988:988:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    988:988:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    989:990:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2274:2275 -> a
-    989:990:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    989:990:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    991:991:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    991:991:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2275 -> a
-    991:991:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    991:991:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    992:992:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2275:2275 -> a
-    992:992:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    992:992:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    993:1003:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
-    993:1003:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2275 -> a
-    993:1003:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    993:1003:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1004:1004:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
-    1004:1004:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2275 -> a
-    1004:1004:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    1004:1004:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1005:1005:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> a
-    1005:1005:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2275 -> a
-    1005:1005:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    1005:1005:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1006:1006:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
-    1006:1006:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2275 -> a
-    1006:1006:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    1006:1006:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1007:1025:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2276:2294 -> a
-    1007:1025:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    1007:1025:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1026:1026:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2265:2265 -> a
-    1026:1026:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2197 -> a
-    1026:1026:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1027:1029:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2256:2258 -> a
-    1027:1029:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2199 -> a
-    1027:1029:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1030:1030:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200:2200 -> a
-    1030:1030:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1031:1053:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):68:90 -> a
-    1031:1053:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1031:1053:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1054:1054:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):88:88 -> a
-    1054:1054:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1054:1054:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1055:1055:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):86:86 -> a
-    1055:1055:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1055:1055:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1056:1056:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):84:84 -> a
-    1056:1056:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1056:1056:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1057:1069:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):70:82 -> a
-    1057:1069:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1057:1069:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1070:1070:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):80:80 -> a
-    1070:1070:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1070:1070:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1071:1071:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):78:78 -> a
-    1071:1071:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1071:1071:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1072:1072:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):76:76 -> a
-    1072:1072:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2200 -> a
-    1072:1072:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1073:1096:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2201:2224 -> a
-    1073:1096:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1097:1133:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2215:2251 -> a
-    1097:1133:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2161 -> a
-    1134:1134:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> a
-    1134:1134:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1108 -> a
-    1135:1135:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> a
-    1135:1135:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1109 -> a
-    1136:1136:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1110:1110 -> a
-    1137:1137: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):2354:2354 -> a
-    1137:1137:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1110 -> a
-    1138:1139:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1111:1112 -> a
-    1140:1140:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
-    1140:1140:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1113 -> a
-    1141:1141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> a
-    1141:1141:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1201 -> a
-    1142:1142:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> a
-    1142:1142:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1202 -> a
-    1143:1146:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1203:1206 -> a
-    1147:1147:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> a
-    1147:1147:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2113 -> a
-    1148:1148:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2114:2114 -> a
-    1149:1149: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):2354:2354 -> a
-    1149:1149:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2114 -> a
-    1150:1151:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2115:2116 -> a
-    1152:1152:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
-    1152:1152:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2117 -> a
-    1153:1153:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> a
-    1153:1153:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1780 -> a
-    1154:1154:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1781:1781 -> a
-    1155:1155: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):2354:2354 -> a
-    1155:1155:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1781 -> a
-    1156:1157:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1782:1783 -> a
-    1158:1158:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
-    1158:1158:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1784 -> a
-    1159:1162:com.android.tools.r8.ir.code.Value readIntLiteral(long):2319:2322 -> a
-    1163:1165:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2329:2331 -> a
-    1166:1166:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2358:2358 -> a
-    1166:1166:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2123 -> a
-    1167:1171:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2124:2128 -> a
-    1172:1172:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531:531 -> a
-    1172:1172:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2128 -> a
-    1173:1173:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    1173:1173:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531 -> a
-    1173:1173:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2128 -> a
-    1174:1184:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2129:2139 -> a
-    1185:1189:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2137:2141 -> a
-    1190:1190:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2358:2358 -> a
-    1190:1190:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2336 -> a
-    1191:1191:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> a
-    1191:1191:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2337 -> a
-    1192:1193:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2349:2350 -> a
-    1194:1194:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> a
-    1194:1194:void addBooleanNonThisArgument(int):1010 -> a
-    1195:1196:void addBooleanNonThisArgument(int):1011:1012 -> a
-    1197:1197:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> a
-    1197:1197:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1004 -> a
-    1198:1199:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1005:1006 -> a
-    1200:1200:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2432:2432 -> a
-    1201:1205:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2464:2468 -> a
-    1201:1205:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2432 -> a
-    1206:1206:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    1206:1206:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2468 -> a
-    1206:1206:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2432 -> a
-    1207:1207:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2468:2468 -> a
-    1207:1207:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2432 -> a
-    1208:1208:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2465:2465 -> a
-    1208:1208:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2432 -> a
-    1209:1234:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2433:2458 -> a
-    1235:1239:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2447:2451 -> a
-    1240:1246:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2449:2455 -> a
-    1247:1247:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2529:2529 -> a
-    1247:1247:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2522 -> a
-    1247:1247:void ensureSuccessorBlock(int,int,boolean):2558 -> a
-    1248:1250:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2523:2525 -> a
-    1248:1250:void ensureSuccessorBlock(int,int,boolean):2558 -> a
-    1251:1254:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2513:2516 -> a
-    1251:1254:void ensureSuccessorBlock(int,int,boolean):2559 -> a
-    1255:1255:void ensureSuccessorBlock(int,int,boolean):2560:2560 -> a
-    1256:1256:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):284:284 -> a
-    1256:1256:void ensureSuccessorBlock(int,int,boolean):2562 -> a
-    1257:1257:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):280:280 -> a
-    1257:1257:void ensureSuccessorBlock(int,int,boolean):2563 -> a
-    1258:1258:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):297:297 -> a
-    1258:1258:void ensureSuccessorBlock(int,int,boolean):2565 -> a
-    1259:1259:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):293:293 -> a
-    1259:1259:void ensureSuccessorBlock(int,int,boolean):2566 -> a
-    1260:1260:void ensureSuccessorBlock(int,int,boolean):2568:2568 -> a
-    1261:1261:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2590:2590 -> a
-    1261:1261:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1419 -> a
-    1262:1262:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2590:2590 -> a
-    1262:1262:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1420 -> a
-    1263:1268:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1421:1426 -> a
-    1269:1272:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2607:2610 -> a
-    1273:1273:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2609:2609 -> a
-    1274:1276:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2624:2626 -> a
-    1274:1276:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1277:1277:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2594:2594 -> a
-    1277:1277:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2586 -> a
-    1277:1277:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2626 -> a
-    1277:1277:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1278:1278:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2582:2582 -> a
-    1278:1278:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2586 -> a
-    1278:1278:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2626 -> a
-    1278:1278:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1279:1279:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2627:2627 -> a
-    1279:1279:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1280:1281:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():312:313 -> a
-    1280:1281:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2628 -> a
-    1280:1281:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1282:1282:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2631:2631 -> a
-    1282:1282:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1283:1283:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2582:2582 -> a
-    1283:1283:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2632 -> a
-    1283:1283:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1284:1284:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():301:301 -> a
-    1284:1284:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2633 -> a
-    1284:1284:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1285:1295:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2636:2646 -> a
-    1285:1295:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1296:1304:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2643:2651 -> a
-    1296:1304:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1305:1310:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2667:2672 -> a
-    1305:1310:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2651 -> a
-    1305:1310:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1311:1318:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2652:2659 -> a
-    1311:1318:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1319:1321:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():305:307 -> a
-    1319:1321:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2662 -> a
-    1319:1321:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1322:1322:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2662:2662 -> a
-    1322:1322:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2611 -> a
-    1323:1323:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> a
-    1323:1323:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2612 -> a
-    1324:1324:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2613:2613 -> a
-    1325:1325:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2761:2761 -> a
+    716:728:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1514:1526 -> a
+    729:733:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1536:1540 -> a
+    734:737:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1539:1542 -> a
+    738:755:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1569:1586 -> a
+    756:760:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1591:1595 -> a
+    761:764:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1594:1597 -> a
+    765:788:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1608:1631 -> a
+    789:805:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1635:1651 -> a
+    806:830:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1672:1696 -> a
+    831:845:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1700:1714 -> a
+    846:846:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1727:1727 -> a
+    847:847:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    847:847:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1727 -> a
+    848:851:void addNewArrayFilledData(int,int,long,short[]):1798:1801 -> a
+    852:852:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
+    852:852:void addNewArrayFilledData(int,int,long,short[]):1802 -> a
+    853:856:void addStaticGet(int,com.android.tools.r8.graph.DexField):1848:1851 -> a
+    857:862:void addStaticGet(int,com.android.tools.r8.graph.DexField):1849:1854 -> a
+    863:863:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
+    863:863:void addStaticGet(int,com.android.tools.r8.graph.DexField):1855 -> a
+    864:907:void addSwitch(int,int[],int,int[]):1887:1930 -> a
+    908:908:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    908:908:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    908:908:void addSwitch(int,int[],int,int[]):1935 -> a
+    909:909:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    909:909:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    909:909:void addSwitch(int,int[],int,int[]):1936 -> a
+    910:914:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1943:1947 -> a
+    910:914:void addSwitch(int,int[],int,int[]):1937 -> a
+    915:915:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2576:2576 -> a
+    915:915:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1949 -> a
+    915:915:void addSwitch(int,int[],int,int[]):1937 -> a
+    916:939:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1950:1973 -> a
+    916:939:void addSwitch(int,int[],int,int[]):1937 -> a
+    940:940:void addSwitch(int,int[],int,int[]):1938:1938 -> a
+    941:942:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2143:2144 -> a
+    943:962:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2159:2178 -> a
+    943:962:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    963:973:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2250:2260 -> a
+    963:973:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    963:973:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    974:974:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    974:974:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2260 -> a
+    974:974:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    974:974:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    975:976:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2260:2261 -> a
+    975:976:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    975:976:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    977:977:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    977:977:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    977:977:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    977:977:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    978:978:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261:2261 -> a
+    978:978:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    978:978:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    979:989:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
+    979:989:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    979:989:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    979:989:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    990:990:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
+    990:990:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    990:990:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    990:990:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    991:991:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> a
+    991:991:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    991:991:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    991:991:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    992:992:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
+    992:992:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    992:992:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    992:992:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    993:1011:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2262:2280 -> a
+    993:1011:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    993:1011:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1012:1012:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2251:2251 -> a
+    1012:1012:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2183 -> a
+    1012:1012:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1013:1015:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2242:2244 -> a
+    1013:1015:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2185 -> a
+    1013:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186:2186 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1017:1039:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):68:90 -> a
+    1017:1039:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1017:1039:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1040:1040:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):88:88 -> a
+    1040:1040:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1040:1040:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1041:1041:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):86:86 -> a
+    1041:1041:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1041:1041:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1042:1042:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):84:84 -> a
+    1042:1042:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1042:1042:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1043:1055:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):70:82 -> a
+    1043:1055:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1043:1055:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1056:1056:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):80:80 -> a
+    1056:1056:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1056:1056:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1057:1057:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):78:78 -> a
+    1057:1057:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1057:1057:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1058:1058:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):76:76 -> a
+    1058:1058:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186 -> a
+    1058:1058:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1059:1082:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2187:2210 -> a
+    1059:1082:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1083:1119:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2201:2237 -> a
+    1083:1119:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2147 -> a
+    1120:1120:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1120:1120:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1108 -> a
+    1121:1121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1121:1121:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1109 -> a
+    1122:1122:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1110:1110 -> a
+    1123:1123: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):2340:2340 -> a
+    1123:1123:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1110 -> a
+    1124:1125:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1111:1112 -> a
+    1126:1126:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
+    1126:1126:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1113 -> a
+    1127:1127:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1127:1127:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1201 -> a
+    1128:1128:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1128:1128:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1202 -> a
+    1129:1132:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1203:1206 -> a
+    1133:1133:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1133:1133:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2099 -> a
+    1134:1134:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2100:2100 -> a
+    1135:1135: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):2340:2340 -> a
+    1135:1135:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2100 -> a
+    1136:1137:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2101:2102 -> a
+    1138:1138:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
+    1138:1138:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2103 -> a
+    1139:1139:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1139:1139:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1766 -> a
+    1140:1140:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1767:1767 -> a
+    1141:1141: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):2340:2340 -> a
+    1141:1141:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1767 -> a
+    1142:1143:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1768:1769 -> a
+    1144:1144:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
+    1144:1144:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1770 -> a
+    1145:1148:com.android.tools.r8.ir.code.Value readIntLiteral(long):2305:2308 -> a
+    1149:1151:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2315:2317 -> a
+    1152:1152:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2344:2344 -> a
+    1152:1152:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2109 -> a
+    1153:1157:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2110:2114 -> a
+    1158:1158:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531:531 -> a
+    1158:1158:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2114 -> a
+    1159:1159:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
+    1159:1159:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531 -> a
+    1159:1159:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2114 -> a
+    1160:1170:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2115:2125 -> a
+    1171:1175:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2123:2127 -> a
+    1176:1176:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2344:2344 -> a
+    1176:1176:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2322 -> a
+    1177:1177:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2348:2348 -> a
+    1177:1177:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2323 -> a
+    1178:1179:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2335:2336 -> a
+    1180:1180:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2348:2348 -> a
+    1180:1180:void addBooleanNonThisArgument(int):1010 -> a
+    1181:1182:void addBooleanNonThisArgument(int):1011:1012 -> a
+    1183:1183:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2348:2348 -> a
+    1183:1183:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1004 -> a
+    1184:1185:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1005:1006 -> a
+    1186:1186:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2418:2418 -> a
+    1187:1191:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2450:2454 -> a
+    1187:1191:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2418 -> a
+    1192:1192:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    1192:1192:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2454 -> a
+    1192:1192:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2418 -> a
+    1193:1193:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2454:2454 -> a
+    1193:1193:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2418 -> a
+    1194:1194:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2451:2451 -> a
+    1194:1194:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2418 -> a
+    1195:1220:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2419:2444 -> a
+    1221:1225:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2433:2437 -> a
+    1226:1232:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2435:2441 -> a
+    1233:1233:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2515:2515 -> a
+    1233:1233:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2508 -> a
+    1233:1233:void ensureSuccessorBlock(int,int,boolean):2544 -> a
+    1234:1236:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2509:2511 -> a
+    1234:1236:void ensureSuccessorBlock(int,int,boolean):2544 -> a
+    1237:1240:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2499:2502 -> a
+    1237:1240:void ensureSuccessorBlock(int,int,boolean):2545 -> a
+    1241:1241:void ensureSuccessorBlock(int,int,boolean):2546:2546 -> a
+    1242:1242:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):284:284 -> a
+    1242:1242:void ensureSuccessorBlock(int,int,boolean):2548 -> a
+    1243:1243:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):280:280 -> a
+    1243:1243:void ensureSuccessorBlock(int,int,boolean):2549 -> a
+    1244:1244:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):297:297 -> a
+    1244:1244:void ensureSuccessorBlock(int,int,boolean):2551 -> a
+    1245:1245:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):293:293 -> a
+    1245:1245:void ensureSuccessorBlock(int,int,boolean):2552 -> a
+    1246:1246:void ensureSuccessorBlock(int,int,boolean):2554:2554 -> a
+    1247:1247:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2576:2576 -> a
+    1247:1247:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1419 -> a
+    1248:1248:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2576:2576 -> a
+    1248:1248:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1420 -> a
+    1249:1254:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1421:1426 -> a
+    1255:1258:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2593:2596 -> a
+    1259:1259:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2595:2595 -> a
+    1260:1262:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2610:2612 -> a
+    1260:1262:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1263:1263:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2580:2580 -> a
+    1263:1263:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2572 -> a
+    1263:1263:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2612 -> a
+    1263:1263:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1264:1264:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2568:2568 -> a
+    1264:1264:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2572 -> a
+    1264:1264:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2612 -> a
+    1264:1264:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1265:1265:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2613:2613 -> a
+    1265:1265:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1266:1267:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():312:313 -> a
+    1266:1267:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2614 -> a
+    1266:1267:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1268:1268:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2617:2617 -> a
+    1268:1268:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1269:1269:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2568:2568 -> a
+    1269:1269:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2618 -> a
+    1269:1269:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1270:1270:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():301:301 -> a
+    1270:1270:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2619 -> a
+    1270:1270:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1271:1281:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2622:2632 -> a
+    1271:1281:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1282:1290:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2629:2637 -> a
+    1282:1290:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1291:1296:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2653:2658 -> a
+    1291:1296:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2637 -> a
+    1291:1296:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1297:1304:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2638:2645 -> a
+    1297:1304:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1305:1307:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():305:307 -> a
+    1305:1307:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2648 -> a
+    1305:1307:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1308:1308:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2648:2648 -> a
+    1308:1308:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2597 -> a
+    1309:1309:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> a
+    1309:1309:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2598 -> a
+    1310:1310:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2599:2599 -> a
+    1311:1311:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2747:2747 -> a
     1:20:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):63:82 -> b
     1:20:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1180 -> b
     21:21:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):78:78 -> b
@@ -36561,351 +36755,351 @@
     47:50:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1185 -> b
     51:51:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1187:1187 -> b
     52:65:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1056:1069 -> b
-    66:66:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> b
+    66:66:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> b
     66:66:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1070 -> b
     67:67:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1117:1117 -> b
-    68:68:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> b
+    68:68:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> b
     68:68:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1118 -> b
     69:70:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1119:1120 -> b
-    71:71: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):2354:2354 -> b
+    71:71: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):2340:2340 -> b
     71:71:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1120 -> b
     72:73:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1121:1122 -> b
-    74:74:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> b
+    74:74:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> b
     74:74:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1123 -> b
     75:79:void addConstClass(int,com.android.tools.r8.graph.DexType):1237:1241 -> b
     80:80:void addTrivialIf(int,int):1405:1405 -> b
-    81:81:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2590:2590 -> b
+    81:81:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2576:2576 -> b
     81:81:void addTrivialIf(int,int):1409 -> b
     82:85:void addTrivialIf(int,int):1412:1415 -> b
     86:89:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1503:1506 -> b
-    90:96:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1669:1675 -> b
-    97:101:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1802:1806 -> b
-    102:102:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> b
-    102:102:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1808 -> b
-    103:103:void addReturn():1844:1844 -> b
-    104:106:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1849:1851 -> b
-    104:106:void addReturn():1844 -> b
-    107:110:void addStaticPut(int,com.android.tools.r8.graph.DexField):1873:1876 -> b
-    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> b
-    111:111:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1788 -> b
-    112:112:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1789:1789 -> b
-    113:113: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):2354:2354 -> b
-    113:113:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1789 -> b
-    114:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1791:1794 -> b
-    118:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2303:2306 -> b
-    118:121:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1794 -> b
-    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2312:2315 -> b
-    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2307 -> b
-    122:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1794 -> b
-    126:128:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1795:1797 -> b
-    129:129:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> b
-    129:129:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1798 -> b
-    130:130:void addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> b
-    131:131:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2590:2590 -> b
+    90:96:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1655:1661 -> b
+    97:101:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1788:1792 -> b
+    102:102:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> b
+    102:102:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1794 -> b
+    103:103:void addReturn():1830:1830 -> b
+    104:106:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1835:1837 -> b
+    104:106:void addReturn():1830 -> b
+    107:110:void addStaticPut(int,com.android.tools.r8.graph.DexField):1859:1862 -> b
+    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> b
+    111:111:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1774 -> b
+    112:112:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1775:1775 -> b
+    113:113: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):2340:2340 -> b
+    113:113:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1775 -> b
+    114:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1777:1780 -> b
+    118:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2289:2292 -> b
+    118:121:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1780 -> b
+    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2298:2301 -> b
+    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2293 -> b
+    122:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1780 -> b
+    126:128:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1781:1783 -> b
+    129:129:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> b
+    129:129:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1784 -> b
+    130:130:void addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> b
+    131:131:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2576:2576 -> b
     131:131:void addGoto(int):1397 -> b
     132:135:void addGoto(int):1398:1401 -> b
-    136:136:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2765:2765 -> b
+    136:136:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2751:2751 -> b
     1:1:boolean canUseStackMapTypes():761:761 -> c
     2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1127:1127 -> c
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> c
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> c
     3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1128 -> c
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> c
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> c
     4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1129 -> c
     5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1130:1130 -> c
-    6:6: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):2354:2354 -> c
+    6:6: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):2340:2340 -> c
     6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1130 -> c
     7:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1131:1132 -> c
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> c
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> c
     9:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1133 -> c
-    10:10:void checkInvokeArgumentRegisters(int,int):1733:1733 -> c
+    10:10:void checkInvokeArgumentRegisters(int,int):1719:1719 -> c
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    11:11:void checkInvokeArgumentRegisters(int,int):1733 -> c
-    12:12:void checkInvokeArgumentRegisters(int,int):1733:1733 -> c
-    13:17:void addMoveException(int):1740:1744 -> c
-    18:20:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1749:1751 -> c
-    18:20:void addMoveException(int):1745 -> c
+    11:11:void checkInvokeArgumentRegisters(int,int):1719 -> c
+    12:12:void checkInvokeArgumentRegisters(int,int):1719:1719 -> c
+    13:17:void addMoveException(int):1726:1730 -> c
+    18:20:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1735:1737 -> c
+    18:20:void addMoveException(int):1731 -> c
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    21:21:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1751 -> c
-    21:21:void addMoveException(int):1745 -> c
-    22:25:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1751:1754 -> c
-    22:25:void addMoveException(int):1745 -> c
+    21:21:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1737 -> c
+    21:21:void addMoveException(int):1731 -> c
+    22:25:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1737:1740 -> c
+    22:25:void addMoveException(int):1731 -> c
     26:26:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    26:26:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1754 -> c
-    26:26:void addMoveException(int):1745 -> c
-    27:27:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1754:1754 -> c
-    27:27:void addMoveException(int):1745 -> c
-    28:30:void addInitClass(int,com.android.tools.r8.graph.DexType):1855:1857 -> c
-    31:31:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> c
-    31:31:void addInitClass(int,com.android.tools.r8.graph.DexType):1858 -> c
-    32:34:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2146:2148 -> c
-    35:50:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2473:2488 -> c
+    26:26:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1740 -> c
+    26:26:void addMoveException(int):1731 -> c
+    27:27:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1740:1740 -> c
+    27:27:void addMoveException(int):1731 -> c
+    28:30:void addInitClass(int,com.android.tools.r8.graph.DexType):1841:1843 -> c
+    31:31:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> c
+    31:31:void addInitClass(int,com.android.tools.r8.graph.DexType):1844 -> c
+    32:34:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2132:2134 -> c
+    35:50:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2459:2474 -> c
     1:1:void lambda$allPhisAreStackMapPhis$1(com.android.tools.r8.ir.code.Instruction):768:768 -> d
     2:2:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1137:1137 -> d
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> d
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> d
     3:3:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1138 -> d
     4:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1139:1140 -> d
-    6:6: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):2354:2354 -> d
+    6:6: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):2340:2340 -> d
     6:6:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1140 -> d
     7:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1141:1142 -> d
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> d
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> d
     9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1143 -> d
-    10:14:void addMoveResult(int):1760:1764 -> d
+    10:14:void addMoveResult(int):1746:1750 -> d
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> d
-    15:15:void addMoveResult(int):1766 -> d
+    15:15:void addMoveResult(int):1752 -> d
     16:16:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> d
-    16:16:void addMoveResult(int):1766 -> d
-    17:17:void addMoveResult(int):1768:1768 -> d
-    18:18:void addMoveResult(int):1767:1767 -> d
+    16:16:void addMoveResult(int):1752 -> d
+    17:17:void addMoveResult(int):1754:1754 -> d
+    18:18:void addMoveResult(int):1753:1753 -> d
     19:19:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> d
-    19:19:void addMoveResult(int):1772 -> d
-    20:23:void addMoveResult(int):1773:1776 -> d
-    24:27:void addNewInstance(int,com.android.tools.r8.graph.DexType):1820:1823 -> d
-    28:28:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> d
-    28:28:void addNewInstance(int,com.android.tools.r8.graph.DexType):1824 -> d
-    29:29:void ensureExceptionalSuccessorBlock(int,int):2576:2576 -> d
-    30:31:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2598:2599 -> d
+    19:19:void addMoveResult(int):1758 -> d
+    20:23:void addMoveResult(int):1759:1762 -> d
+    24:27:void addNewInstance(int,com.android.tools.r8.graph.DexType):1806:1809 -> d
+    28:28:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> d
+    28:28:void addNewInstance(int,com.android.tools.r8.graph.DexType):1810 -> d
+    29:29:void ensureExceptionalSuccessorBlock(int,int):2562:2562 -> d
+    30:31:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2584:2585 -> d
     32:32:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):526:526 -> d
-    32:32:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2600 -> d
-    33:35:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2601:2603 -> d
+    32:32:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2586 -> d
+    33:35:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2587:2589 -> d
     1:1:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):677:677 -> e
     2:4:void flushArgumentInstructions():1043:1045 -> e
     5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1293:1293 -> e
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> e
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> e
     6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1294 -> e
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> e
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> e
     7:7:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1295 -> e
     8:8:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1297:1297 -> e
-    9:9: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):2354:2354 -> e
+    9:9: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):2340:2340 -> e
     9:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1296 -> e
     10:12:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1298:1300 -> e
-    13:21:void addReturn(int):1828:1836 -> e
-    22:22:void addReturn(int):1835:1835 -> e
+    13:21:void addReturn(int):1814:1822 -> e
+    22:22:void addReturn(int):1821:1821 -> e
     23:23:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromDexType(com.android.tools.r8.graph.DexType):111:111 -> e
-    23:23:void addReturn(int):1837 -> e
-    24:25:void addReturn(int):1838:1839 -> e
-    26:28:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1849:1851 -> e
-    26:28:void addReturn(int):1839 -> e
-    29:29:void ensureNormalSuccessorBlock(int,int):2572:2572 -> e
+    23:23:void addReturn(int):1823 -> e
+    24:25:void addReturn(int):1824:1825 -> e
+    26:28:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1835:1837 -> e
+    26:28:void addReturn(int):1825 -> e
+    29:29:void ensureNormalSuccessorBlock(int,int):2558:2558 -> e
     1:2:java.util.List getArgumentValues():510:511 -> f
     3:3:void resolveAndBuildNewArrayFilledData(int,int):966:966 -> f
     4:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1304:1305 -> f
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> f
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> f
     6:6:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1306 -> f
     7:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1307:1309 -> f
-    10:10: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):2354:2354 -> f
+    10:10: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):2340:2340 -> f
     10:10:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1308 -> f
     11:13:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1310:1312 -> f
-    14:18:void addThrow(int):1991:1995 -> f
-    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> f
-    19:19:void addThrow(int):1995 -> f
-    20:20:void addThrow(int):1996:1996 -> f
+    14:18:void addThrow(int):1977:1981 -> f
+    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> f
+    19:19:void addThrow(int):1981 -> f
+    20:20:void addThrow(int):1982:1982 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():506:506 -> g
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> g
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> g
     2:2:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1346 -> g
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> g
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> g
     3:3:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1347 -> g
     4:4:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1348:1348 -> g
-    5:5: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):2354:2354 -> g
+    5:5: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):2340:2340 -> g
     5:5:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1348 -> g
     6:7:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1349:1350 -> g
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> g
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> g
     8:8:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1351 -> g
-    9:10:void checkRegister(int):2369:2370 -> g
+    9:10:void checkRegister(int):2355:2356 -> g
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
-    11:11:void checkRegister(int):2370 -> g
-    12:12:void checkRegister(int):2370:2370 -> g
-    13:13:void checkRegister(int):2367:2367 -> g
+    11:11:void checkRegister(int):2356 -> g
+    12:12:void checkRegister(int):2356:2356 -> g
+    13:13:void checkRegister(int):2353:2353 -> g
     1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():490:490 -> h
     2:2:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1355:1355 -> h
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> h
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> h
     3:3:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1356 -> h
     4:5:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1357:1358 -> h
-    6:6: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):2354:2354 -> h
+    6:6: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):2340:2340 -> h
     6:6:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1358 -> h
     7:8:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1359:1360 -> h
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> h
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> h
     9:9:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1361 -> h
-    10:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2495:2496 -> h
-    12:12:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2529:2529 -> h
-    12:12:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2499 -> h
-    13:16:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2513:2516 -> h
-    13:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2500 -> h
-    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2501:2502 -> h
+    10:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2481:2482 -> h
+    12:12:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2515:2515 -> h
+    12:12:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2485 -> h
+    13:16:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2499:2502 -> h
+    13:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2486 -> h
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2487:2488 -> h
     19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):318:319 -> h
-    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     21:22:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> h
     21:22:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):319 -> h
-    21:22:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    21:22:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     23:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):319:324 -> h
-    23:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    23:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     29:30:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):288:289 -> h
     29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):325 -> h
-    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):327:328 -> h
-    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     33:34:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> h
     33:34:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):328 -> h
-    33:34:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    33:34:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     35:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):328:332 -> h
-    35:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    35:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     40:40:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):293:293 -> h
     40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):333 -> h
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     41:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):335:335 -> h
-    41:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    41:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     42:43:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> h
     42:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):335 -> h
-    42:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
+    42:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
     44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):335:335 -> h
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> h
-    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2504:2507 -> h
+    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2488 -> h
+    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2490:2493 -> h
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():498:498 -> i
-    2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2000:2000 -> i
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> i
-    3:3:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2001 -> i
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> i
-    4:4:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2002 -> i
-    5:5:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2003:2003 -> i
-    6:6: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):2354:2354 -> i
-    6:6:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2003 -> i
-    7:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2004:2005 -> i
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> i
-    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2006 -> i
-    10:10:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2590:2590 -> i
+    2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1986:1986 -> i
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> i
+    3:3:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1987 -> i
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> i
+    4:4:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1988 -> i
+    5:5:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1989:1989 -> i
+    6:6: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):2340:2340 -> i
+    6:6:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1989 -> i
+    7:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1990:1991 -> i
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> i
+    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1992 -> i
+    10:10:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2576:2576 -> i
     1:1:com.android.tools.r8.ir.code.Value getReceiverValue():515:515 -> j
-    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2010:2010 -> j
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> j
-    3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2011 -> j
-    4:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2012:2013 -> j
-    6:6: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):2354:2354 -> j
-    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2013 -> j
-    7:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2014:2015 -> j
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> j
-    9:9:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2016 -> j
-    10:11:boolean isIndexProcessed(int):2533:2534 -> j
-    12:13:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2551:2552 -> j
-    12:13:boolean isIndexProcessed(int):2536 -> j
-    14:14:boolean isIndexProcessed(int):2537:2537 -> j
+    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1996:1996 -> j
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> j
+    3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1997 -> j
+    4:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1998:1999 -> j
+    6:6: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):2340:2340 -> j
+    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1999 -> j
+    7:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2000:2001 -> j
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> j
+    9:9:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2002 -> j
+    10:11:boolean isIndexProcessed(int):2519:2520 -> j
+    12:13:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2537:2538 -> j
+    12:13:boolean isIndexProcessed(int):2522 -> j
+    14:14:boolean isIndexProcessed(int):2523:2523 -> j
     1:1:boolean isDebugMode():502:502 -> k
     2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1374:1374 -> k
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> k
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> k
     3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1375 -> k
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> k
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> k
     4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1376 -> k
     5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1378:1378 -> k
-    6:6: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):2354:2354 -> k
+    6:6: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):2340:2340 -> k
     6:6:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1377 -> k
     7:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1379:1380 -> k
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> k
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> k
     9:9:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1381 -> k
     1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1385:1386 -> l
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> l
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> l
     3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1387 -> l
     4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1388:1390 -> l
-    7:7: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):2354:2354 -> l
+    7:7: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):2340:2340 -> l
     7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1389 -> l
     8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1391:1392 -> l
-    10:10:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> l
+    10:10:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> l
     10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1393 -> l
-    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889:1889 -> m
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> m
-    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1890 -> m
-    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1891:1892 -> m
-    5:5: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):2354:2354 -> m
-    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1892 -> m
-    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1895:1896 -> m
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> m
-    8:8:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1897 -> m
-    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2020:2020 -> n
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> n
-    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2021 -> n
-    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2022:2023 -> n
-    5:5: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):2354:2354 -> n
-    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2023 -> n
-    6:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2024:2025 -> n
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> n
-    8:8:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2026 -> n
-    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2030:2030 -> o
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> o
-    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2031 -> o
-    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2032:2033 -> o
-    5:5: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):2354:2354 -> o
-    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2033 -> o
-    6:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2034:2035 -> o
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> o
-    8:8:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2036 -> o
-    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2040:2040 -> p
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> p
-    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2041 -> p
-    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2042:2043 -> p
-    5:5: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):2354:2354 -> p
-    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2043 -> p
-    6:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2044:2045 -> p
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> p
-    8:8:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2046 -> p
-    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2050:2050 -> q
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> q
-    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2051 -> q
-    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2052:2053 -> q
-    5:5: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):2354:2354 -> q
-    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2053 -> q
-    6:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2054:2055 -> q
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> q
-    8:8:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2056 -> q
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> r
-    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1880 -> r
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> r
-    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1881 -> r
-    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1882:1882 -> r
-    4:4: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):2354:2354 -> r
-    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1882 -> r
-    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1883:1884 -> r
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> r
-    7:7:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1885 -> r
-    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2060:2060 -> s
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> s
-    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2061 -> s
-    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2062:2063 -> s
-    5:5: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):2354:2354 -> s
-    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2063 -> s
-    6:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2064:2065 -> s
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> s
-    8:8:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2066 -> s
-    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2070:2070 -> t
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> t
-    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2071 -> t
-    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2072:2073 -> t
-    5:5: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):2354:2354 -> t
-    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2073 -> t
-    6:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2074:2075 -> t
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> t
-    8:8:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2076 -> t
-    1:7:java.lang.String toString():2774:2780 -> toString
-    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2080:2080 -> u
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> u
-    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2081 -> u
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> u
-    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2082 -> u
-    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2083:2083 -> u
-    5:5: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):2354:2354 -> u
-    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2083 -> u
-    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2085:2092 -> u
-    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> u
-    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2093 -> u
-    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2097:2097 -> v
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2299:2299 -> v
-    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2098 -> v
-    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2100:2101 -> v
-    5:5: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):2354:2354 -> v
-    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2101 -> v
-    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2102:2105 -> v
-    10:10: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):2354:2354 -> v
-    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2105 -> v
-    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2106:2108 -> v
-    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2428:2428 -> v
-    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2109 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.we$a:
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.we$b:
+    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1875:1875 -> m
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> m
+    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1876 -> m
+    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1877:1878 -> m
+    5:5: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):2340:2340 -> m
+    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1878 -> m
+    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1881:1882 -> m
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> m
+    8:8:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1883 -> m
+    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2006:2006 -> n
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> n
+    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2007 -> n
+    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2008:2009 -> n
+    5:5: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):2340:2340 -> n
+    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2009 -> n
+    6:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2010:2011 -> n
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> n
+    8:8:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2012 -> n
+    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2016:2016 -> o
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> o
+    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2017 -> o
+    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2018:2019 -> o
+    5:5: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):2340:2340 -> o
+    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2019 -> o
+    6:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2020:2021 -> o
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> o
+    8:8:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2022 -> o
+    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2026:2026 -> p
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> p
+    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2027 -> p
+    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2028:2029 -> p
+    5:5: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):2340:2340 -> p
+    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2029 -> p
+    6:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2030:2031 -> p
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> p
+    8:8:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2032 -> p
+    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2036:2036 -> q
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> q
+    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2037 -> q
+    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2038:2039 -> q
+    5:5: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):2340:2340 -> q
+    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2039 -> q
+    6:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2040:2041 -> q
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> q
+    8:8:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2042 -> q
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> r
+    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1866 -> r
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> r
+    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1867 -> r
+    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1868:1868 -> r
+    4:4: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):2340:2340 -> r
+    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1868 -> r
+    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1869:1870 -> r
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> r
+    7:7:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1871 -> r
+    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2046:2046 -> s
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> s
+    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2047 -> s
+    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2048:2049 -> s
+    5:5: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):2340:2340 -> s
+    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2049 -> s
+    6:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2050:2051 -> s
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> s
+    8:8:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2052 -> s
+    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2056:2056 -> t
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> t
+    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2057 -> t
+    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2058:2059 -> t
+    5:5: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):2340:2340 -> t
+    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2059 -> t
+    6:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2060:2061 -> t
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> t
+    8:8:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2062 -> t
+    1:7:java.lang.String toString():2760:2766 -> toString
+    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2066:2066 -> u
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> u
+    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2067 -> u
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> u
+    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2068 -> u
+    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2069:2069 -> u
+    5:5: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):2340:2340 -> u
+    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2069 -> u
+    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2071:2078 -> u
+    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> u
+    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2079 -> u
+    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2083:2083 -> v
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> v
+    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2084 -> v
+    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2086:2087 -> v
+    5:5: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):2340:2340 -> v
+    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2087 -> v
+    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2088:2091 -> v
+    10:10: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):2340:2340 -> v
+    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2091 -> v
+    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2092:2094 -> v
+    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2414:2414 -> v
+    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2095 -> v
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.Re$a:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.Re$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
@@ -36913,7 +37107,7 @@
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:7:void <init>():271:277 -> <init>
     1:25:java.lang.String toString():341:365 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.we$c:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.Re$c:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -36922,7 +37116,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.we$d:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.Re$d:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -36930,13 +37124,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.we$e:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.Re$e:
     java.util.List values -> a
     1:3:void <init>():233:235 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):241:243 -> a
     1:9:boolean equals(java.lang.Object):255:263 -> equals
     1:1:int hashCode():250:250 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.we$f:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.Re$f:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
@@ -37033,7 +37227,7 @@
     117:117:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor):521:521 -> a
     118:121: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:534 -> a
     122:128: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:539 -> a
-    129:134:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1049:1054 -> a
+    129:134:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1052:1057 -> a
     129:134: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):539 -> a
     135:160:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):593:618 -> a
     135:160: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):542 -> a
@@ -37049,7 +37243,7 @@
     164:164: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):543:543 -> a
     165:165:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):564:564 -> a
     165:165: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):543 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     166:166:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):567 -> a
     166:166: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):543 -> a
     167:186:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):570:589 -> a
@@ -37090,7 +37284,7 @@
     297:299:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1013:1015 -> a
     300:300:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1024:1024 -> a
     301:303: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):1043:1045 -> a
-    304:309:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1049:1054 -> a
+    304:309:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1052:1057 -> a
     304:309: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):1045 -> a
     310:310: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):1088:1088 -> a
     310:310: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):1047 -> a
@@ -37112,7 +37306,7 @@
     364:369:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1946:1951 -> a
     364:369: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):1166 -> a
     370:376: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):1167:1173 -> a
-    377:377:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1747:1747 -> a
+    377:377:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1757:1757 -> a
     377:377: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 -> a
     378:403: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):1174:1199 -> a
     404:434: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):1197:1227 -> a
@@ -37133,16 +37327,16 @@
     609:621: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):1396:1408 -> a
     622:667: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):1407:1452 -> a
     668:762: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:1535 -> a
-    763:768:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1059:1064 -> a
+    763:768:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1062:1067 -> a
     763:768:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1535 -> a
-    769:811: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):1536:1578 -> a
-    812:812:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1755:1755 -> a
-    812:812: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):1578 -> a
-    813:821: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):1579:1587 -> a
-    822:822:void lambda$optimize$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1270:1270 -> a
-    823:823:void lambda$optimize$16(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1274:1274 -> a
-    824:826:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1454:1454 -> a
-    827:877:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1600:1650 -> a
+    769:807: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):1536:1574 -> a
+    808:808:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1765:1765 -> a
+    808:808: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):1574 -> a
+    809:817: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):1575:1583 -> a
+    818:818:void lambda$optimize$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1270:1270 -> a
+    819:819:void lambda$optimize$16(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1274:1274 -> a
+    820:822:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1454:1454 -> a
+    823:877:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1596:1650 -> a
     878:879:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1664:1665 -> a
     880:885:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1681:1686 -> a
     880:885:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1666 -> a
@@ -37175,7 +37369,7 @@
     923:932:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1715 -> a
     933:935:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1716:1718 -> a
     936:943:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1751:1758 -> a
-    944:944:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1780:1780 -> a
+    944:944:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1790:1790 -> a
     944:944:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1758 -> a
     945:945:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1759:1759 -> a
     946:958:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3966:3978 -> a
@@ -37238,7 +37432,7 @@
     1:1:boolean isInWave():890:890 -> c
     2:6:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1000:1004 -> c
     7:7:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1831:1831 -> c
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1731:1731 -> c
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1741:1741 -> c
     8:8:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1831 -> c
     9:20:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1834:1845 -> c
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> c
@@ -37264,7 +37458,7 @@
     43:54:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1865 -> c
     1:1:void reportNestDesugarDependencies():365:365 -> d
     2:2:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1780:1780 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1768:1768 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1778:1778 -> d
     3:3:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1780 -> d
     4:20:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1784:1800 -> d
     21:33:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1930:1942 -> d
@@ -37279,96 +37473,105 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):115:119 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):108:108 -> a
     2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):108:108 -> a
-    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):123:127 -> a
-    8:9:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):133:134 -> a
+    3:5:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):123:125 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
+    6:6:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):125 -> a
+    7:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):126:126 -> a
+    8:9:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):132:133 -> a
     10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    10:10:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):135 -> a
-    11:12:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):135:136 -> a
-    13:23:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):144:154 -> a
-    24:44:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):795:815 -> a
-    24:44:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):156 -> a
-    45:552:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):159:666 -> a
-    553:561:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):437:445 -> a
-    562:567:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):444:449 -> a
-    568:572:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):448:452 -> a
-    573:665:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):451:543 -> a
-    666:666:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):542:542 -> a
-    667:677:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):395:405 -> a
-    678:683:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):404:409 -> a
-    684:691:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):408:415 -> a
-    692:697:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):414:419 -> a
-    698:698:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():42:42 -> a
-    698:698:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):419 -> a
-    699:708:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):420:429 -> a
-    709:712:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):197:200 -> a
-    713:1076:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):199:562 -> a
-    1077:1077:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):561:561 -> a
-    1078:1081:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):549:552 -> a
-    1082:1082:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):551:551 -> a
-    1083:1107:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):211:235 -> a
-    1108:1141:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):750:783 -> a
-    1108:1141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):235 -> a
-    1142:1142:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):774:774 -> a
-    1142:1142:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):235 -> a
-    1143:1143:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):773:773 -> a
-    1143:1143:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):235 -> a
-    1144:1165:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):238:259 -> a
-    1166:1186:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):254:274 -> a
-    1187:1204:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):269:286 -> a
-    1205:1206:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.graph.RewrittenPrototypeDescription.getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):432:433 -> a
-    1205:1206:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):286 -> a
-    1207:1215:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):287:295 -> a
-    1216:1260:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):294:338 -> a
-    1261:1261:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1261:1261:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):338 -> a
-    1262:1262:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1262:1262:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1262:1262:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):338 -> a
-    1263:1271:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):338:346 -> a
-    1272:1278:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):345:351 -> a
-    1279:1309:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):350:380 -> a
-    1310:1655:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):165:510 -> a
-    1656:1662:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):508:514 -> a
-    1663:1665:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):513:515 -> a
-    1666:1676:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):460:470 -> a
-    1677:1687:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):469:479 -> a
-    1688:1693:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):478:483 -> a
-    1694:1694:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():42:42 -> a
-    1694:1694:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):483 -> a
-    1695:1820:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):484:609 -> a
-    1821:1823:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):587:589 -> a
-    1824:1826:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):578:580 -> a
-    1827:1830:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):569:572 -> a
-    1831:1831:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):571:571 -> a
-    1832:2184:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):182:534 -> a
-    2185:2185:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):533:533 -> a
-    2186:2189:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):522:525 -> a
-    2190:2346:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):524:680 -> a
-    2347:2347:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):200:200 -> a
-    2348:2354:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):220:226 -> a
-    2355:2355:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):115:115 -> a
-    2355:2355:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):226 -> a
-    2356:2356:java.util.Map lambda$rewrite$2(com.android.tools.r8.ir.analysis.value.SingleNumberValue):315:315 -> a
-    2357:2363:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):319:325 -> a
-    2364:2364:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):324:324 -> a
-    2365:2372:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):321:328 -> a
-    2373:2377:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):327:331 -> a
-    2378:2378:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):525:525 -> a
-    2379:2379:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):543:543 -> a
-    2380:2380:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):553:553 -> a
-    2381:2381:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):563:563 -> a
-    2382:2382:com.android.tools.r8.ir.code.Instruction lambda$rewrite$10(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):581:581 -> a
-    2383:2390:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):684:691 -> a
-    2391:2396:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):690:695 -> a
-    2397:2398:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):706:707 -> a
-    2399:2409:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):720:730 -> a
-    2399:2409:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):708 -> a
-    2410:2411:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):709:710 -> a
-    2412:2415:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):735:738 -> a
-    2412:2415:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):712 -> a
-    2416:2418:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):711:713 -> a
-    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):534:534 -> b
-    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):572:572 -> c
+    10:10:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):134 -> a
+    11:12:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):134:135 -> a
+    13:23:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):143:153 -> a
+    24:44:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):792:812 -> a
+    24:44:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):155 -> a
+    45:547:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):158:660 -> a
+    548:548:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
+    548:548:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):660 -> a
+    549:550:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):662:663 -> a
+    551:559:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):436:444 -> a
+    560:565:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):443:448 -> a
+    566:570:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):447:451 -> a
+    571:663:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):450:542 -> a
+    664:664:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):541:541 -> a
+    665:675:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):394:404 -> a
+    676:681:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):403:408 -> a
+    682:689:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):407:414 -> a
+    690:695:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):413:418 -> a
+    696:696:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():42:42 -> a
+    696:696:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):418 -> a
+    697:706:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):419:428 -> a
+    707:710:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):196:199 -> a
+    711:1074:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):198:561 -> a
+    1075:1075:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):560:560 -> a
+    1076:1079:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):548:551 -> a
+    1080:1080:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):550:550 -> a
+    1081:1105:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):210:234 -> a
+    1106:1139:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):747:780 -> a
+    1106:1139:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):234 -> a
+    1140:1140:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):771:771 -> a
+    1140:1140:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):234 -> a
+    1141:1141:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):770:770 -> a
+    1141:1141:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):234 -> a
+    1142:1163:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):237:258 -> a
+    1164:1184:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):253:273 -> a
+    1185:1202:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):268:285 -> a
+    1203:1204:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.graph.RewrittenPrototypeDescription.getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):432:433 -> a
+    1203:1204:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):285 -> a
+    1205:1213:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):286:294 -> a
+    1214:1258:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):293:337 -> a
+    1259:1259:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1259:1259:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):337 -> a
+    1260:1260:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1260:1260:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1260:1260:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):337 -> a
+    1261:1269:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):337:345 -> a
+    1270:1276:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):344:350 -> a
+    1277:1307:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):349:379 -> a
+    1308:1653:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):164:509 -> a
+    1654:1660:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):507:513 -> a
+    1661:1663:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):512:514 -> a
+    1664:1674:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):459:469 -> a
+    1675:1685:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):468:478 -> a
+    1686:1691:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):477:482 -> a
+    1692:1692:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():42:42 -> a
+    1692:1692:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):482 -> a
+    1693:1818:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):483:608 -> a
+    1819:1821:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):586:588 -> a
+    1822:1824:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):577:579 -> a
+    1825:1828:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):568:571 -> a
+    1829:1829:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):570:570 -> a
+    1830:2182:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):181:533 -> a
+    2183:2183:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):532:532 -> a
+    2184:2187:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):521:524 -> a
+    2188:2289:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):523:624 -> a
+    2290:2290:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
+    2290:2290:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):624 -> a
+    2291:2342:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):626:677 -> a
+    2343:2343:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):199:199 -> a
+    2344:2350:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):219:225 -> a
+    2351:2351:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):116:116 -> a
+    2351:2351:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):225 -> a
+    2352:2352:java.util.Map lambda$rewrite$2(com.android.tools.r8.ir.analysis.value.SingleNumberValue):314:314 -> a
+    2353:2359:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):318:324 -> a
+    2360:2360:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):323:323 -> a
+    2361:2368:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):320:327 -> a
+    2369:2373:com.android.tools.r8.ir.code.Value lambda$rewrite$3(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):326:330 -> a
+    2374:2374:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):524:524 -> a
+    2375:2375:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):542:542 -> a
+    2376:2376:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):552:552 -> a
+    2377:2377:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):562:562 -> a
+    2378:2378:com.android.tools.r8.ir.code.Instruction lambda$rewrite$10(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):580:580 -> a
+    2379:2386:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):681:688 -> a
+    2387:2392:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):687:692 -> a
+    2393:2394:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):703:704 -> a
+    2395:2405:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):717:727 -> a
+    2395:2405:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):705 -> a
+    2406:2407:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):706:707 -> a
+    2408:2411:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):732:735 -> a
+    2408:2411:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):709 -> a
+    2412:2414:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):708:710 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):533:533 -> b
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):571:571 -> c
 com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.l:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
@@ -37376,20 +37579,20 @@
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():818:818 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):826:830 -> <init>
-    1:11:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):835:845 -> a
+    1:1:void <clinit>():815:815 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):823:827 -> <init>
+    1:11:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):832:842 -> a
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    12:12:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):845 -> a
-    13:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):845:846 -> a
+    12:12:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):842 -> a
+    13:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):842:843 -> a
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
-    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):846 -> a
-    16:17:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):846:847 -> a
+    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):843 -> a
+    16:17:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):843:844 -> a
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
-    18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):847 -> a
-    19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):847:849 -> a
-    22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):845:845 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.Bo:
+    18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):844 -> a
+    19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):844:846 -> a
+    22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):842:842 -> a
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.Yo:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map protoFixupCache -> d
     boolean $assertionsDisabled -> f
@@ -37485,7 +37688,7 @@
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> i
     2:2:void registerField(com.android.tools.r8.graph.DexField):86 -> i
     3:3:void registerField(com.android.tools.r8.graph.DexField):86:86 -> i
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.gr:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.zr:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
@@ -37507,7 +37710,7 @@
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> e
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> f
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> g
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.jr:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.Cr:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation() -> a
     boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -37631,7 +37834,7 @@
     47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     47:47:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):127 -> a
     48:51:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):127:130 -> a
-com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.Gv:
+com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.aw:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit() -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
 com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.v:
@@ -37661,7 +37864,7 @@
     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$WaveStartAction -> com.android.tools.r8.ir.conversion.v$b:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.VC:
     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
@@ -37685,11 +37888,11 @@
     int instructionOffset(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.tE:
     1:7:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):187:193 -> a
     1:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):107 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.KD:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.MD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.lE:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.nE:
     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
@@ -37700,7 +37903,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):619:619 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.LD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.mE:
     1:1:void <init>():621:621 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):648:648 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):660:660 -> a
@@ -37720,7 +37923,7 @@
     63:77:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):738:752 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder.setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):654:654 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):741 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.OD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.pE:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -37730,7 +37933,7 @@
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):316:316 -> a
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):312 -> a
     30:30: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.ND:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.oE:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -37747,7 +37950,7 @@
     21:21:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping.builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):615:615 -> a
     21:21:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):221 -> a
     22:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):223:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.QD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.rE:
     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
@@ -37758,7 +37961,7 @@
     3:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):603:607 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.PD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.qE:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi idValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -37811,7 +38014,7 @@
     28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1510:1512 -> b
     28:30:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):402 -> b
     31:31:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):403:403 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.RD:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.sE:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():769:769 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):772:773 -> a
@@ -37911,7 +38114,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.tE:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.VE:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -37922,13 +38125,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.tE$a:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.VE$a:
     int[] absoluteTargets -> b
     int[] keys -> c
     int userOffset -> a
     1:1:void <init>(int):26:26 -> <init>
     2:7:void <init>(int):22:27 -> <init>
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.xF:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.XF:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -38007,129 +38210,130 @@
     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>():51:51 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):56:59 -> <init>
-    1:1:boolean hasBackports():63:63 -> a
-    2:9: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):74:81 -> a
-    10:11:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):88:89 -> a
-    12:28:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):94:110 -> a
-    29:29:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):117:117 -> a
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):57:60 -> <init>
+    1:1:boolean hasBackports():64:64 -> a
+    2:9: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.graph.DexItemFactory):76:83 -> a
+    10:11:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):90:91 -> a
+    12:28:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):96:112 -> a
+    29:29:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):119:119 -> a
     30:82:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):57:109 -> a
-    30:82:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):117 -> a
-    83:92:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):122:131 -> a
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
-    93:93:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):131 -> a
-    94:108:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):131:145 -> a
+    30:82:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):119 -> a
+    83:92:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):124:133 -> a
+    93:93:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
+    93:93:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):133 -> a
+    94:108:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):133:147 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.Z1$a:
-    1:1:void <init>():1488:1488 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1492:1492 -> a
+    1:1:void <init>():1497:1497 -> <init>
+    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1501:1501 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.Z1$b:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1387:1388 -> <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):1398:1398 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1396:1397 -> <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):1407:1407 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.Z1$c:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory factory -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1408:1408 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1412:1413 -> <init>
-    1:3: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):1424:1426 -> a
-    4:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1432:1436 -> a
-    9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1433:1433 -> a
-    10:12:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1439:1441 -> a
-    13:13:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1441:1441 -> a
-    14:14: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):1449:1449 -> a
-    14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1441 -> a
-    15:15:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1445:1445 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1417:1417 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1421:1422 -> <init>
+    1:3: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):1433:1435 -> a
+    4:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1441:1445 -> a
+    9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1442:1442 -> a
+    10:12:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1448:1450 -> a
+    13:13:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1450:1450 -> a
+    14:14: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):1458:1458 -> a
+    14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1450 -> a
+    15:15:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1454:1454 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.Z1$d:
     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):1484:1484 -> 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):1493:1493 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.Z1$e:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1370:1371 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1379:1380 -> <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.Z1$f:
     java.util.Map rewritable -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():150:150 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):157:157 -> <init>
-    2:47:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):155:200 -> <init>
-    1:1:boolean isEmpty():204:204 -> a
-    2:2:void visit(java.util.function.Consumer):208:208 -> a
-    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):213:343 -> a
-    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):913:913 -> a
-    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1337:1358 -> a
-    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1362:1362 -> a
-    1:338:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):349:686 -> b
-    339:339:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934:934 -> b
+    1:1:void <clinit>():152:152 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):159:159 -> <init>
+    2:47:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):157:202 -> <init>
+    1:1:boolean isEmpty():206:206 -> a
+    2:2:void visit(java.util.function.Consumer):210:210 -> a
+    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):215:345 -> a
+    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):915:915 -> a
+    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1346:1367 -> a
+    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1371:1371 -> a
+    1:338:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):351:688 -> b
+    339:339:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936:936 -> b
     1:6:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):74:79 -> c
-    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):954 -> c
+    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):956 -> c
     7:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77:110 -> c
-    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):954 -> c
+    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):956 -> c
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):105:105 -> c
-    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):954 -> c
+    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):956 -> c
     42:60:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):102:120 -> c
-    42:60:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):954 -> c
-    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):693:851 -> c
-    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):863:910 -> d
-    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):907:931 -> d
-    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):928:951 -> d
-    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):948:966 -> d
-    1:78:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):976:1053 -> e
-    1:7:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1125:1131 -> f
-    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1272:1294 -> g
-    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1138:1198 -> h
-    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1300:1319 -> i
-    1:13:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1061:1073 -> j
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():1936:1936 -> j
-    14:14:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1073 -> j
-    15:19:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1074:1078 -> j
-    20:44:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1072:1096 -> j
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():1936:1936 -> j
-    45:45:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1096 -> j
-    46:50:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1097:1101 -> j
-    51:72:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1095:1116 -> j
-    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1205:1265 -> k
-    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1326:1332 -> l
+    42:60:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):956 -> c
+    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):695:853 -> c
+    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):865:912 -> d
+    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):909:933 -> d
+    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):930:953 -> d
+    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):950:968 -> d
+    1:88:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):978:1065 -> e
+    89:89:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1063:1063 -> e
+    1:7:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1134:1140 -> f
+    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1281:1303 -> g
+    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1147:1207 -> h
+    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1309:1328 -> i
+    1:13:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1070:1082 -> j
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():1946:1946 -> j
+    14:14:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1082 -> j
+    15:19:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1083:1087 -> j
+    20:44:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1081:1105 -> j
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():1946:1946 -> j
+    45:45:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1105 -> j
+    46:50:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1106:1110 -> j
+    51:72:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1104:1125 -> j
+    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1214:1274 -> k
+    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1335:1341 -> l
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.Z1$g:
     com.android.tools.r8.graph.DexType receiverType -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1462:1463 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1468:1468 -> a
-    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1445:1445 -> a
-    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1468 -> a
-    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1468:1468 -> a
+    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):1471:1472 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1477:1477 -> a
+    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1454:1454 -> a
+    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1477 -> a
+    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1477:1477 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.Z1$h:
     com.android.tools.r8.graph.CfCode create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
 com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.s3:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):28:30 -> <init>
-    1:15: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):41:55 -> a
-    16:29:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):59:72 -> a
+    1:15: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.graph.DexItemFactory):42:56 -> a
+    16:29:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):60:73 -> a
     30:31:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():67:67 -> a
-    30:31:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):73 -> a
-    32:32:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):73:73 -> a
-    33:35:boolean isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):81:83 -> a
-    36:40:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):88:92 -> a
-com.android.tools.r8.ir.desugar.CfClassDesugaringCollection -> com.android.tools.r8.internal.V3:
+    30:31:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):74 -> a
+    32:32:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):74:74 -> a
+    33:35:boolean isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):82:84 -> a
+    36:40:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):89:93 -> a
+com.android.tools.r8.ir.desugar.CfClassDesugaringCollection -> com.android.tools.r8.internal.U3:
     1:1:void <init>():10:10 -> <init>
     void desugar(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer) -> a
     boolean isEmpty() -> a
     boolean needsDesugaring(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.ir.desugar.CfClassDesugaringCollection$EmptyCfClassDesugaringCollection -> com.android.tools.r8.internal.T3:
+com.android.tools.r8.ir.desugar.CfClassDesugaringCollection$EmptyCfClassDesugaringCollection -> com.android.tools.r8.internal.S3:
     1:1:void <init>():42:42 -> <init>
     void desugar(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer) -> a
     boolean isEmpty() -> a
     boolean needsDesugaring(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.ir.desugar.CfClassDesugaringCollection$NonEmptyCfClassDesugaringCollection -> com.android.tools.r8.internal.U3:
+com.android.tools.r8.ir.desugar.CfClassDesugaringCollection$NonEmptyCfClassDesugaringCollection -> com.android.tools.r8.internal.T3:
     com.android.tools.r8.ir.desugar.RecordRewriter recordRewriter -> a
     1:2:void <init>(com.android.tools.r8.ir.desugar.RecordRewriter):22:23 -> <init>
     boolean isEmpty() -> a
     1:1:void desugar(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer):28:28 -> a
     2:2:boolean needsDesugaring(com.android.tools.r8.graph.DexProgramClass):33:33 -> a
-    3:3:boolean com.android.tools.r8.ir.desugar.RecordRewriter.needsDesugaring(com.android.tools.r8.graph.DexProgramClass):320:320 -> a
+    3:3:boolean com.android.tools.r8.ir.desugar.RecordRewriter.needsDesugaring(com.android.tools.r8.graph.DexProgramClass):321:321 -> a
     3:3:boolean needsDesugaring(com.android.tools.r8.graph.DexProgramClass):33 -> a
-com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer -> com.android.tools.r8.internal.W3:
+com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer -> com.android.tools.r8.internal.V3:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer$D8CfClassDesugaringEventConsumer -> com.android.tools.r8.internal.W3$a:
+com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer$D8CfClassDesugaringEventConsumer -> com.android.tools.r8.internal.V3$a:
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -38142,11 +38346,11 @@
     3:3:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):27 -> a
     4:4:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
     5:5:void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod):32:32 -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.C4:
-    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
+com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.B4:
+    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.graph.DexItemFactory) -> a
     boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod) -> 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.D4:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.C4:
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.ir.desugar.CfClassDesugaringCollection createClassDesugaringCollection() -> a
     void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
@@ -38157,11 +38361,11 @@
     8:8:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection.empty():35:35 -> a
     8:8:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView):31 -> a
     1:1:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection empty():35:35 -> b
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.F4:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.E4:
     1:1:void <init>():37:37 -> <init>
     1:1:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer createForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor):47:47 -> a
     2:2:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer createForDesugaredCode():59:59 -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.android.tools.r8.internal.E4:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.android.tools.r8.internal.D4:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>():59:59 -> <init>
@@ -38174,7 +38378,7 @@
     1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):93:93 -> b
     2:2:void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):103:103 -> b
     1:1:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):98:98 -> c
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.F4$a:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.E4$a:
     java.util.Map pendingInvokeSpecialBridges -> b
     java.util.List synthesizedLambdaClasses -> c
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> a
@@ -38205,7 +38409,7 @@
     2:2:void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):168:168 -> b
     3:4:boolean verifyNothingToFinalize():219:220 -> b
     1:1:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):163:163 -> c
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.F4$b:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.E4$b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map synthesizedLambdaClasses -> d
     java.util.List pendingInvokeSpecialBridges -> e
@@ -38231,7 +38435,7 @@
     void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> c
     1:2:void finalizeInvokeSpecialDesugaring():315:316 -> c
     1:14:void finalizeLambdaDesugaring():324:337 -> d
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.X8:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.Y8:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int $r8$clinit -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
@@ -38308,7 +38512,7 @@
     178:178:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
     178:178:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):260 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99:99 -> b
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.S9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.T9:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set trackedCallBackAPIs -> g
     java.util.Set trackedAPIs -> h
@@ -38367,7 +38571,7 @@
     87:87:void desugar(com.android.tools.r8.ir.code.IRCode):134 -> a
     88:110:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):467:489 -> a
     88:110:void desugar(com.android.tools.r8.ir.code.IRCode):134 -> a
-    111:111:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):115:115 -> a
+    111:111:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):116:116 -> a
     111:111:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):485 -> a
     111:111:void desugar(com.android.tools.r8.ir.code.IRCode):134 -> a
     112:114:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):491:491 -> a
@@ -38379,7 +38583,7 @@
     141:141:java.util.List lambda$addCallBackSignature$1(com.android.tools.r8.graph.DexProgramClass):268:268 -> a
     142:156:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):280:294 -> a
     157:162:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):302:307 -> a
-    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     163:163:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):307 -> a
     164:164:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):308:308 -> a
     165:172:void lambda$generateCallbackMethods$3(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,java.util.List):322:329 -> a
@@ -38389,7 +38593,7 @@
     186:187:void lambda$generateCallbackMethods$2(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexEncodedMethod):326:327 -> a
     188:194:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String):359:365 -> a
     195:207:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):369:381 -> a
-    208:208:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    208:208:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     208:208:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):381 -> a
     209:209:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):384:384 -> a
     210:210:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):382:382 -> a
@@ -38409,7 +38613,7 @@
     25:25:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     25:25:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
     26:26:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216:216 -> b
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> b
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> b
     27:27:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
     28:34:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):235:241 -> b
     28:34:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):219 -> b
@@ -38418,21 +38622,21 @@
     1:2:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):162:163 -> c
     3:7:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):250:254 -> c
     3:7:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> c
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> c
     8:8:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):254 -> c
     8:8:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
     9:12:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):258:261 -> c
     9:12:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
     1:16:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):175:190 -> d
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> d
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> d
     17:17:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):190 -> d
     18:18:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):193:193 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.internal.S9$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.internal.T9$a:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode GENERATE_CALLBACKS_AND_WRAPPERS -> a
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode ASSERT_CALLBACKS_AND_WRAPPERS_GENERATED -> b
     1:2:void <clinit>():82:83 -> <clinit>
     1:1:void <init>(java.lang.String,int):81:81 -> <init>
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.T9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.U9:
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration EMPTY_DESUGARED_LIBRARY_CONFIGURATION -> p
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
     java.util.Map retargetCoreLibMember -> i
@@ -38477,8 +38681,8 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():153:153 -> m
     1:1:java.util.Set getWrapperConversions():203:203 -> n
     1:1:boolean isLibraryCompilation():149:149 -> o
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.T9$a:
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.T9$b:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.U9$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.U9$b:
     java.lang.String identifier -> g
     java.lang.String synthesizedLibraryClassesPackagePrefix -> f
     java.util.List extraKeepRules -> p
@@ -38551,7 +38755,7 @@
     5:5:int sharpIndex(java.lang.String,java.lang.String):371 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):371:371 -> f
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):378:378 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.U9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.V9:
     com.android.tools.r8.utils.SemanticVersion MIN_SUPPORTED_VERSION -> g
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder configurationBuilder -> e
     com.android.tools.r8.origin.Origin origin -> f
@@ -38588,7 +38792,7 @@
     126:140:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
     141:153:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):210:222 -> a
     141:153:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.ba:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> d
     java.util.Map retargetLibraryMember -> b
     java.util.Map nonFinalHolderRewrites -> c
@@ -38656,7 +38860,7 @@
     173:173:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
     174:180:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):697:703 -> a
     174:180:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
-    181:181:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    181:181:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     181:181:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):705 -> a
     181:181:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):66 -> a
     182:182:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):705:705 -> a
@@ -38681,18 +38885,18 @@
     18:18:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexClassAndMethod):66 -> b
     1:1:java.util.Map access$500(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):66:66 -> c
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet access$600(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):66:66 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.X9:
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.Y9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.Y9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.Z9:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():499:499 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):499:499 -> <init>
     1:1:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):504:504 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     2:2:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):504 -> a
     3:3:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):598:598 -> a
     3:3:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):505 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     4:4:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):598 -> a
     4:4:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):505 -> a
     5:19:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):598:612 -> a
@@ -38732,7 +38936,7 @@
     78:85:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):505 -> a
     86:86:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):507:507 -> a
     87:87:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):513:513 -> a
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     88:88:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):513 -> a
     89:89:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):513:513 -> a
     90:90:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
@@ -38765,7 +38969,7 @@
     144:145:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):579:580 -> a
     144:145:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):537 -> a
     146:146:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):538:538 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.aa:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():362:362 -> <clinit>
@@ -38773,7 +38977,7 @@
     2:2:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1):362:362 -> <init>
     1:12:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():365:376 -> a
     1:12:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    13:13:boolean com.android.tools.r8.graph.DexClass.isFinal():601:601 -> a
+    13:13:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> a
     13:13:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():377 -> a
     13:13:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
     14:14:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():378:378 -> a
@@ -38791,7 +38995,7 @@
     28:29:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):479:480 -> a
     28:29:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():387 -> a
     28:29:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     30:30:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod):480 -> a
     30:30:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():387 -> a
     30:30:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):362 -> a
@@ -38824,7 +39028,7 @@
     110:112:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):452:454 -> a
     113:116:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):471:474 -> a
     117:117:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):473:473 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.ca:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString dexWrapperPrefixDexString -> c
     java.util.Map typeWrappers -> d
@@ -38873,7 +39077,7 @@
     92:92:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271 -> a
     92:92:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.Code):386 -> a
     93:117:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):392:416 -> a
-    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     118:118:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):416 -> a
     119:127:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):416:424 -> a
     128:128:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):431:431 -> a
@@ -38898,7 +39102,7 @@
     176:191:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):302:317 -> a
     176:191:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195 -> a
     176:191:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):518 -> a
-    192:192:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    192:192:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     192:192:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):317 -> a
     192:192:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195 -> a
     192:192:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):518 -> a
@@ -38982,12 +39186,12 @@
     5:5:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
     5:5:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178 -> c
     6:6:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178:178 -> c
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> c
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> c
     7:7:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178 -> c
     8:9:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):178:179 -> c
     1:2:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):151:152 -> d
     1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):136:136 -> e
-com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.ab:
+com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.bb:
     com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -38997,9 +39201,18 @@
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     1:1:com.android.tools.r8.ir.desugar.CfClassDesugaringCollection createClassDesugaringCollection():46:46 -> a
     1:1:com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection getInstance():23:23 -> c
-com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.td:
     int getFreshLocal(int) -> a
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.do:
+com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.uj:
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>():28:28 -> <init>
+    1: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.graph.DexItemFactory):39:48 -> a
+    11:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):53:56 -> a
+    15:15:boolean com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.isInvokingPrivateMethodOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):73:73 -> a
+    15:15:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):56 -> a
+    16:22:com.android.tools.r8.graph.DexEncodedMethod privateMethodInvokedOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):60:66 -> a
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.Ao:
     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
@@ -39074,7 +39287,7 @@
     212:217:com.android.tools.r8.graph.DexField getCaptureField(int):139:144 -> a
     218:218:com.android.tools.r8.graph.DexField getCaptureField(int):141:141 -> a
     219:220:boolean canAccessModifyLambdaImplMethod():303:304 -> a
-    221:221:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1418:1418 -> a
+    221:221:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1429:1429 -> a
     221:221:boolean canAccessModifyLambdaImplMethod():304 -> a
     222:223:boolean canAccessModifyLambdaImplMethod():305:306 -> a
     224:224:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):182:182 -> a
@@ -39110,7 +39323,7 @@
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():187:187 -> d
     2:2:boolean isStateless():148 -> d
     3:3:boolean doesNotNeedAccessor(com.android.tools.r8.graph.ProgramMethod):299:299 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.so:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():699:699 -> <clinit>
@@ -39127,20 +39340,20 @@
     83:83:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
     83:83:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):733 -> a
     84:87:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):733:736 -> a
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     88:88:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):736 -> a
     89:91:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):736:738 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.Wn:
+com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.to:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():502:502 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):504:505 -> <init>
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.Xn:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.uo:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():634:634 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):636:637 -> <init>
     1:36:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):647:682 -> a
-    37:37:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     37:37:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):682 -> a
     38:47:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):683:692 -> a
     48:61:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):656:669 -> a
@@ -39148,13 +39361,13 @@
     62:62:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):669 -> a
     63:65:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):671:673 -> a
     66:66:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):672:672 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.Yn:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.vo:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():550:550 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):552:553 -> <init>
     1:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):562:601 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     41:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):601 -> a
     42:51:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):602:611 -> a
     52:64:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):573:585 -> a
@@ -39163,18 +39376,18 @@
     66:68:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):587:589 -> a
     69:73:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):588:592 -> 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):591:591 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.Zn:
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.wo:
     com.android.tools.r8.graph.DexType exceptionType -> f
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):621:622 -> <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.ao:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.xo:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):513:513 -> <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.bo:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.yo:
     com.android.tools.r8.graph.ProgramMethod target -> g
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):530:531 -> <init>
     1:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):539:542 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.co:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.zo:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> d
     boolean $assertionsDisabled -> e
@@ -39187,10 +39400,10 @@
     2:5:void com.android.tools.r8.ir.desugar.LambdaClass$Target.ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):490:493 -> a
     2:5:void ensureAccessibilityIfNeeded():483 -> a
     1:4:void ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):490:493 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.eo:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.Bo:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.fo:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.Co:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> j
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexType targetHolder -> k
@@ -39240,13 +39453,13 @@
     257:260:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):439:442 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMainMethod():66:66 -> b
     2:3:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):254:255 -> b
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.ko:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.Ho:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():39:39 -> <clinit>
     1:12:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):71:82 -> a
     13:13:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
     14:45:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):92:123 -> a
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):708:708 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):716:716 -> a
     46:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):130 -> a
     47:56:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):131:140 -> a
     57:57:boolean isSameOrAdaptableTo(byte,byte):165:165 -> a
@@ -39310,7 +39523,7 @@
     279:293: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:446 -> a
     279:293: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):363 -> a
     294:294:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):365:365 -> a
-    295:295:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):708:708 -> a
+    295:295:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):716:716 -> a
     295:295: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):368 -> a
     296:301: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):370:375 -> a
     302:302: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):371:371 -> a
@@ -39322,12 +39535,12 @@
     358:361:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):484:487 -> a
     362:362:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):478:478 -> a
     363:406:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):470:513 -> a
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.Go:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():468:468 -> <clinit>
-com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.qp:
+com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.Np:
     void allocateLocalStack(int) -> a
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.Qs:
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.kt:
     java.util.List desugarings -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring nestBasedAccessDesugaring -> c
@@ -39335,47 +39548,50 @@
     com.android.tools.r8.ir.desugar.RecordRewriter recordRewriter -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):43:43 -> <init>
-    2:29:void <init>(com.android.tools.r8.graph.AppView):38:65 -> <init>
-    30:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring):72:72 -> <init>
-    31:69:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring):38:76 -> <init>
-    1:2:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):101:102 -> a
-    3:3:void lambda$scan$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):102:102 -> a
-    4:18:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):110:124 -> a
+    2:30:void <init>(com.android.tools.r8.graph.AppView):38:66 -> <init>
+    31:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring):73:73 -> <init>
+    32:71:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring):38:77 -> <init>
+    1:2:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):102:103 -> a
+    3:3:void lambda$scan$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):103:103 -> a
+    4:18:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):111:125 -> a
     19:33:java.util.List com.android.tools.r8.utils.ListUtils.flatMap(java.util.List,java.util.function.Function,java.util.List):28:42 -> a
-    19:33:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):123 -> a
-    34:40:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):148:154 -> a
-    41:41:java.util.Collection lambda$desugar$1(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):126:126 -> a
-    42:54:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.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):174:186 -> a
-    42:54:java.util.Collection lambda$desugar$1(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):127 -> a
-    55:60:java.util.Collection lambda$desugar$1(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):137:142 -> a
-    61:64:com.android.tools.r8.ir.desugar.CfClassDesugaringCollection createClassDesugaringCollection():160:163 -> a
-    65:79:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):196:210 -> a
-    80:80:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):209:209 -> a
-    81:81:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):206:206 -> a
-    82:82:boolean lambda$needsDesugaring$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):210:210 -> a
-    83:83:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
-    84:84:boolean lambda$needsDesugaring$3(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):215:215 -> a
-    85:85:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):223:223 -> a
-    86:88:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> a
-    86:88:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):223 -> a
-    89:89:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):223:223 -> a
-    90:90:boolean lambda$verifyNoOtherDesugaringNeeded$6(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):226:226 -> a
-    91:91:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForDesugaredCode():59:59 -> a
-    91:91:boolean lambda$verifyNoOtherDesugaringNeeded$6(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):235 -> a
-    92:92:boolean lambda$verifyNoOtherDesugaringNeeded$6(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):226:226 -> a
-    93:93:int lambda$verifyNoOtherDesugaringNeeded$4(int):229:229 -> a
-    94:96:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):246:248 -> a
-    1:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):80:82 -> b
-    4:11:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):87:94 -> b
+    19:33:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):124 -> a
+    34:40:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):149:155 -> a
+    41:41:java.util.Collection lambda$desugar$1(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):127:127 -> a
+    42:53:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.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):175:186 -> a
+    42:53:java.util.Collection lambda$desugar$1(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):128 -> a
+    54:63:java.util.Collection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.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):179:188 -> a
+    54:63:java.util.Collection lambda$desugar$1(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):128 -> a
+    64:69:java.util.Collection lambda$desugar$1(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):138:143 -> a
+    70:73:com.android.tools.r8.ir.desugar.CfClassDesugaringCollection createClassDesugaringCollection():161:164 -> a
+    74:88:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):198:212 -> a
+    89:89:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):211:211 -> a
+    90:90:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):208:208 -> a
+    91:91:boolean lambda$needsDesugaring$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):212:212 -> a
+    92:92:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):216:216 -> a
+    93:93:boolean lambda$needsDesugaring$3(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):217:217 -> a
+    94:94:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):225:225 -> a
+    95:97:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> a
+    95:97:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):225 -> a
+    98:98:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):225:225 -> a
+    99:99:boolean lambda$verifyNoOtherDesugaringNeeded$6(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):228:228 -> a
+    100:100:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForDesugaredCode():59:59 -> a
+    100:100:boolean lambda$verifyNoOtherDesugaringNeeded$6(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):237 -> a
+    101:104:boolean lambda$verifyNoOtherDesugaringNeeded$6(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):237:240 -> a
+    105:105:boolean lambda$verifyNoOtherDesugaringNeeded$6(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):228:228 -> a
+    106:106:int lambda$verifyNoOtherDesugaringNeeded$4(int):231:231 -> a
+    107:109:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):249:251 -> a
+    1:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):81:83 -> b
+    4:11:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):88:95 -> b
     12:12:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():98:98 -> b
-    12:12:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):95 -> b
+    12:12:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):96 -> b
     13:13:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.DexEncodedMethod.getPosition():1440:1440 -> b
     13:13:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():98 -> b
-    13:13:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):95 -> b
-    14:14:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):95:95 -> b
-    15:15:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):91:91 -> b
-    16:16:void lambda$verifyNoOtherDesugaringNeeded$5(int):233:233 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.Sv:
+    13:13:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):96 -> b
+    14:14:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):96:96 -> b
+    15:15:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):92:92 -> b
+    16:16:void lambda$verifyNoOtherDesugaringNeeded$5(int):235:235 -> b
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.mw:
     1:1:void <init>():23:23 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
@@ -39384,7 +39600,7 @@
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):38:42 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.Sv$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.mw$a:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -39409,11 +39625,11 @@
     2:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121:126 -> b
     8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):166:166 -> b
     8:8:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    9:9:int com.android.tools.r8.graph.DexString.getArrayDim():513:513 -> b
-    9:9:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):502 -> b
+    9:9:int com.android.tools.r8.graph.DexString.getArrayDim():517:517 -> b
+    9:9:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):506 -> b
     9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):166 -> b
     9:9:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    10:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):506:508 -> b
+    10:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):510:512 -> b
     10:12:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):166 -> b
     10:12:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
     13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167:167 -> b
@@ -39426,14 +39642,14 @@
     20:30:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
     31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):172:172 -> b
     31:31:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.Tv:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.nw:
     1:1:void <init>():207:207 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean shouldRewriteTypeName(java.lang.String) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.RecordCfMethods -> com.android.tools.r8.internal.My:
+com.android.tools.r8.ir.desugar.RecordCfMethods -> com.android.tools.r8.internal.nz:
     1:19:com.android.tools.r8.graph.CfCode RecordMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):56:74 -> a
     20:31:com.android.tools.r8.graph.CfCode RecordMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):71:82 -> a
     32:46:com.android.tools.r8.graph.CfCode RecordMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):79:93 -> a
@@ -39498,10 +39714,10 @@
     311:325:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433:447 -> c
     326:326:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):444:444 -> c
     327:555:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224:452 -> c
-com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.Py:
+com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.qz:
     void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass) -> a
     void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.desugar.RecordRewriter -> com.android.tools.r8.internal.Ry:
+com.android.tools.r8.ir.desugar.RecordRewriter -> com.android.tools.r8.internal.sz:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto recordToStringHelperProto -> c
@@ -39522,7 +39738,7 @@
     12:12:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):86 -> a
     13:16:void com.android.tools.r8.ir.desugar.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):96:99 -> a
     13:16:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):86 -> a
-    17:20:boolean com.android.tools.r8.ir.desugar.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexMethod):338:341 -> a
+    17:20:boolean com.android.tools.r8.ir.desugar.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexMethod):339:342 -> a
     17:20:void com.android.tools.r8.ir.desugar.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):99 -> a
     17:20:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):86 -> a
     21:21:void com.android.tools.r8.ir.desugar.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):100:100 -> a
@@ -39532,105 +39748,105 @@
     22:22:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):86 -> a
     23:24:void com.android.tools.r8.ir.desugar.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):105:106 -> a
     23:24:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):86 -> a
-    25:26:boolean com.android.tools.r8.ir.desugar.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexField):333:334 -> a
+    25:26:boolean com.android.tools.r8.ir.desugar.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexField):334:335 -> a
     25:26:void com.android.tools.r8.ir.desugar.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):106 -> a
     25:26:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):86 -> a
     27:34:void com.android.tools.r8.ir.desugar.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):107:114 -> a
     27:34:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):86 -> a
-    35:35: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):129:129 -> a
+    35:35: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.graph.DexItemFactory):130:130 -> a
     36:36:boolean com.android.tools.r8.cf.code.CfInstruction.isInitClass():0:0 -> a
-    36:36: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):129 -> a
-    37:38: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):129:130 -> a
+    36:36: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.graph.DexItemFactory):130 -> a
+    37:38: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.graph.DexItemFactory):130:131 -> a
     39:39:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    39:39: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):130 -> a
-    40:42: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):130:132 -> a
-    43:58:java.util.List com.android.tools.r8.ir.desugar.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):151:166 -> a
-    43:58: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):131 -> a
+    39:39: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.graph.DexItemFactory):131 -> a
+    40:42: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.graph.DexItemFactory):131:133 -> a
+    43:58:java.util.List com.android.tools.r8.ir.desugar.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152:167 -> a
+    43:58: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.graph.DexItemFactory):132 -> a
     59:59:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
-    59:59:java.util.List com.android.tools.r8.ir.desugar.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):165 -> a
-    59:59: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):131 -> a
-    60:70:java.util.List com.android.tools.r8.ir.desugar.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):167:177 -> a
-    60:70: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):131 -> a
-    71:77: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):134:140 -> a
-    78:78: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):139:139 -> a
-    79:87:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):183:191 -> a
+    59:59:java.util.List com.android.tools.r8.ir.desugar.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):166 -> a
+    59:59: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.graph.DexItemFactory):132 -> a
+    60:70:java.util.List com.android.tools.r8.ir.desugar.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):168:178 -> a
+    60:70: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.graph.DexItemFactory):132 -> a
+    71:77: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.graph.DexItemFactory):135:141 -> a
+    78:78: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.graph.DexItemFactory):140:140 -> a
+    79:87:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):184:192 -> a
     88:88:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
     88:88:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271 -> a
-    88:88:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):191 -> a
-    89:92:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):194:194 -> a
-    96:96:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):198:198 -> a
-    97:97:void ensureGetFieldsAsObjects(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):203:203 -> a
-    98:100:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.RecordRewriter.getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):217:217 -> a
-    98:100:void ensureGetFieldsAsObjects(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):203 -> a
-    101:110:void ensureGetFieldsAsObjects(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):204:213 -> a
-    111:115:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):225:229 -> a
-    116:116:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):227:227 -> a
-    117:119:void lambda$synthesizeRecordHelper$1(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):233:235 -> a
-    120:120:com.android.tools.r8.graph.Code lambda$synthesizeRecordHelper$0(java.util.function.BiFunction,com.android.tools.r8.graph.DexMethod):235:235 -> a
-    121:129:java.util.List desugarInvokeRecordEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):259:267 -> a
-    130:130:java.util.List desugarInvokeRecordEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):266:266 -> a
-    131:141:java.util.List desugarInvokeRecordToString(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):277:287 -> a
-    142:142:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):293:293 -> a
+    88:88:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):192 -> a
+    89:92:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):195:195 -> a
+    96:96:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):199:199 -> a
+    97:97:void ensureGetFieldsAsObjects(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):204:204 -> a
+    98:100:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.RecordRewriter.getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):218:218 -> a
+    98:100:void ensureGetFieldsAsObjects(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):204 -> a
+    101:110:void ensureGetFieldsAsObjects(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):205:214 -> a
+    111:115:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):226:230 -> a
+    116:116:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):228:228 -> a
+    117:119:void lambda$synthesizeRecordHelper$1(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):234:236 -> a
+    120:120:com.android.tools.r8.graph.Code lambda$synthesizeRecordHelper$0(java.util.function.BiFunction,com.android.tools.r8.graph.DexMethod):236:236 -> a
+    121:129:java.util.List desugarInvokeRecordEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):260:268 -> a
+    130:130:java.util.List desugarInvokeRecordEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):267:267 -> a
+    131:141:java.util.List desugarInvokeRecordToString(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):278:288 -> a
+    142:142:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):294:294 -> a
     143:143:boolean com.android.tools.r8.cf.code.CfInstruction.isInitClass():0:0 -> a
-    143:143:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):293 -> a
-    144:148:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):293:297 -> a
+    143:143:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):294 -> a
+    144:148:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):294:298 -> a
     149:149:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    149:149:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):297 -> a
-    150:150:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):298:298 -> a
+    149:149:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):298 -> a
+    150:150:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):299:299 -> a
     151:151:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> a
-    151:151:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):299 -> a
-    152:152:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):299:299 -> a
+    151:151:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):300 -> a
+    152:152:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):300:300 -> a
     153:153:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> a
-    153:153:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):300 -> a
-    154:154:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):300:300 -> a
+    153:153:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):301 -> a
+    154:154:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):301:301 -> a
     155:155:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> a
-    155:155:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):301 -> a
-    156:161:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):301:306 -> a
-    162:162:boolean com.android.tools.r8.ir.desugar.RecordRewriter.needsDesugaring(com.android.tools.r8.graph.DexMethod,boolean):365:365 -> a
-    162:162:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):306 -> a
-    163:166:void desugar(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer):325:328 -> a
-    167:170:boolean refersToRecord(com.android.tools.r8.graph.DexProto):345:348 -> a
-    171:172:boolean com.android.tools.r8.ir.desugar.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexType[]):352:353 -> a
-    171:172:boolean refersToRecord(com.android.tools.r8.graph.DexProto):348 -> a
-    173:173:boolean refersToRecord(com.android.tools.r8.graph.DexType):361:361 -> a
-    174:216:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):369:411 -> a
-    217:223:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):410:416 -> a
+    155:155:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):302 -> a
+    156:161:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):302:307 -> a
+    162:162:boolean com.android.tools.r8.ir.desugar.RecordRewriter.needsDesugaring(com.android.tools.r8.graph.DexMethod,boolean):366:366 -> a
+    162:162:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):307 -> a
+    163:166:void desugar(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfClassDesugaringEventConsumer):326:329 -> a
+    167:170:boolean refersToRecord(com.android.tools.r8.graph.DexProto):346:349 -> a
+    171:172:boolean com.android.tools.r8.ir.desugar.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexType[]):353:354 -> a
+    171:172:boolean refersToRecord(com.android.tools.r8.graph.DexProto):349 -> a
+    173:173:boolean refersToRecord(com.android.tools.r8.graph.DexType):362:362 -> a
+    174:216:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):370:412 -> a
+    217:223:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):411:417 -> a
     224:224:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isInstanceGet():140:140 -> a
-    224:224:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):416 -> a
-    225:243:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):416:434 -> a
-    244:244:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):433:433 -> a
-    245:261:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):442:458 -> a
-    262:262:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):449:449 -> a
+    224:224:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):417 -> a
+    225:243:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):417:435 -> a
+    244:244:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):434:434 -> a
+    245:261:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):443:459 -> a
+    262:262:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):450:450 -> a
     263:263:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    263:263:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):449 -> a
-    264:264:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):449:449 -> a
-    265:275:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeR8Record():462:472 -> a
-    265:275:void requiresRecordClass(com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):312 -> a
-    276:286:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeR8Record():469:479 -> a
-    276:286:void requiresRecordClass(com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):312 -> a
-    287:287:void requiresRecordClass(com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):314:314 -> a
-    288:291:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():483:486 -> a
-    292:300:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeRecordInitMethod():522:530 -> a
-    292:300:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():489 -> a
+    263:263:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):450 -> a
+    264:264:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):450:450 -> a
+    265:275:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeR8Record():463:473 -> a
+    265:275:void requiresRecordClass(com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):313 -> a
+    276:286:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeR8Record():470:480 -> a
+    276:286:void requiresRecordClass(com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):313 -> a
+    287:287:void requiresRecordClass(com.android.tools.r8.ir.desugar.RecordDesugaringEventConsumer):315:315 -> a
+    288:291:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():484:487 -> a
+    292:300:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeRecordInitMethod():523:531 -> a
+    292:300:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():490 -> a
     301:301:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
-    301:301:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeRecordInitMethod():530 -> a
-    301:301:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():489 -> a
-    302:304:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeRecordInitMethod():533:533 -> a
-    302:304:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():489 -> a
-    305:307:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():507:509 -> a
-    305:307:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():491 -> a
-    308:310:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.RecordRewriter.getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):217:217 -> a
-    308:310:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():509 -> a
-    308:310:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():491 -> a
-    311:316:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():510:515 -> a
-    311:316:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():491 -> a
+    301:301:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeRecordInitMethod():531 -> a
+    301:301:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():490 -> a
+    302:304:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeRecordInitMethod():534:534 -> a
+    302:304:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():490 -> a
+    305:307:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():508:510 -> a
+    305:307:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():492 -> a
+    308:310:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.RecordRewriter.getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):218:218 -> a
+    308:310:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():510 -> a
+    308:310:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():492 -> a
+    311:316:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():511:516 -> a
+    311:316:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():492 -> a
     317:317:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
-    317:317:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():515 -> a
-    317:317:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():491 -> a
-    318:320:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():492:494 -> a
-    321:323:void lambda$synchronizedSynthesizeR8Record$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):500:502 -> a
-    1:9:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):243:251 -> b
-    10:10:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):250:250 -> b
+    317:317:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.RecordRewriter.synthesizeAbstractGetFieldsAsObjectsMethod():516 -> a
+    317:317:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():492 -> a
+    318:320:com.android.tools.r8.graph.DexProgramClass synchronizedSynthesizeR8Record():493:495 -> a
+    321:323:void lambda$synchronizedSynthesizeR8Record$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):501:503 -> a
+    1:9:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):244:252 -> b
+    10:10:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):251:251 -> b
 com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer -> com.android.tools.r8.internal.Y1:
     void acceptBackportedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
 com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.a2:
@@ -40700,42 +40916,42 @@
     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.V7:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.W7:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.X7:
     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.cd:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.dd:
     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.Kp:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.hq:
     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.rt:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.Lt:
     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.qt:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.Kt:
     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.Gu:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.av:
     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.Fu:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.Zu:
     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.Lu:
+com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.fv:
     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
@@ -40747,7 +40963,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.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.Ui:
+com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.XC:
+    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.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.pj:
     com.android.tools.r8.graph.CfCode virtualMethodCode -> c
     com.android.tools.r8.graph.ProgramMethod virtualMethod -> b
     com.android.tools.r8.graph.ProgramMethod newDirectMethod -> a
@@ -40766,7 +40985,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.Vi:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.qj:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):34:35 -> <init>
     1:2:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):40:41 -> a
@@ -40777,40 +40996,40 @@
     5:5:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):169 -> a
     5:5:com.android.tools.r8.graph.ProgramMethod needsDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):48 -> a
     6:15:com.android.tools.r8.graph.ProgramMethod needsDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):52:61 -> a
-    16:17: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):76:77 -> a
-    18:26: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):86:94 -> a
-    18:26: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):77 -> a
-    27:27: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):93:93 -> a
-    27:27: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):77 -> a
-    28:28:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):133:133 -> a
-    28:28: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):106 -> a
-    28:28: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):99 -> a
-    28:28: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):77 -> a
+    16:17: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.graph.DexItemFactory):77:78 -> a
+    18:26: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):87:95 -> a
+    18:26: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.graph.DexItemFactory):78 -> a
+    27:27: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):94:94 -> a
+    27:27: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.graph.DexItemFactory):78 -> a
+    28:28:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):134:134 -> a
+    28:28: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):107 -> a
+    28:28: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):100 -> a
+    28:28: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.graph.DexItemFactory):78 -> a
     29:29:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> a
-    29:29:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):135 -> a
-    29:29: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):106 -> a
-    29:29: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):99 -> a
-    29:29: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):77 -> a
-    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):135:135 -> a
-    30:30: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):106 -> a
-    30:30: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):99 -> a
-    30:30: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):77 -> a
+    29:29:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):136 -> a
+    29:29: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):107 -> a
+    29:29: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):100 -> a
+    29:29: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.graph.DexItemFactory):78 -> a
+    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):136:136 -> a
+    30:30: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):107 -> a
+    30:30: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):100 -> a
+    30:30: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.graph.DexItemFactory):78 -> a
     31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):296:296 -> a
-    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):134 -> a
-    31:31: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):106 -> a
-    31:31: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):99 -> a
-    31:31: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):77 -> a
-    32:52: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):107:127 -> a
-    32:52: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):99 -> a
-    32:52: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):77 -> a
-    53:55: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):100:100 -> a
-    53:55: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):77 -> a
-    56:56: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):127:127 -> a
-    56:56: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):99 -> a
-    56:56: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):77 -> a
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer -> com.android.tools.r8.internal.Wi:
+    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):135 -> a
+    31:31: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):107 -> a
+    31:31: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):100 -> a
+    31:31: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.graph.DexItemFactory):78 -> a
+    32:52: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):108:128 -> a
+    32:52: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):100 -> a
+    32:52: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.graph.DexItemFactory):78 -> a
+    53:55: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):101:101 -> a
+    53:55: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.graph.DexItemFactory):78 -> a
+    56:56: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):128:128 -> a
+    56:56: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):100 -> a
+    56:56: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.graph.DexItemFactory):78 -> a
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer -> com.android.tools.r8.internal.rj:
     void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo) -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.S6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.T6:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter rewriter -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -40866,7 +41085,7 @@
     184:207:void lambda$resolveForwardingMethods$6(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):638 -> a
     208:208:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):783:783 -> a
     208:208:void lambda$resolveForwardingMethods$6(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):638 -> a
-    209:209:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    209:209:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     209:209:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):786 -> a
     209:209:void lambda$resolveForwardingMethods$6(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):638 -> a
     210:211:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):786:787 -> a
@@ -41034,8 +41253,8 @@
     44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):403:405 -> b
     44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):914 -> b
     44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> b
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$1 -> com.android.tools.r8.internal.K6:
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$1 -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.M6:
     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
@@ -41047,7 +41266,7 @@
     2:3:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):141 -> a
     4:8:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):141:145 -> a
     9:9:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):144:144 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.M6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.N6:
     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
@@ -41065,21 +41284,21 @@
     13:14:boolean isEmpty():276:277 -> a
     15:15:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():225:225 -> a
     15:15:boolean isEmpty():277 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.N6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.O6:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces EMPTY -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <clinit>():212:212 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):216:217 -> <init>
     3:4:void <init>(java.util.Set):220:221 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):237:240 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.O6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.P6:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> c
     1:1:void <clinit>():316:316 -> <clinit>
     1:1:void <init>():319:319 -> <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,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter) -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):329:329 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Q6:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures EMPTY -> b
     java.util.Set signatures -> a
     1:1:void <clinit>():65:65 -> <clinit>
@@ -41089,14 +41308,14 @@
     2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():90:90 -> a
     2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):81 -> a
     3:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):84:86 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.R6:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):291:293 -> <init>
     1:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):297:301 -> a
     6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):305:305 -> a
     7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter):309:309 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.R6:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.S6:
     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
@@ -41111,7 +41330,7 @@
     14:14:boolean isEmpty():189 -> a
     15:15:boolean isEmpty():189:189 -> a
     16:20:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):202:206 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.D9:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -41119,8 +41338,8 @@
     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$1 -> com.android.tools.r8.internal.B9:
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.C9$a:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.D9$a:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection EMPTY -> c
@@ -41130,7 +41349,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.EmulatedInterfaceProcessor -> com.android.tools.r8.internal.mb:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceProcessor -> com.android.tools.r8.internal.nb:
     java.util.Map emulatedInterfaces -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter rewriter -> b
@@ -41156,7 +41375,7 @@
     181:181:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):185 -> a
     182:182:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):179:179 -> a
     183:212:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):174:203 -> a
-    213:213:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> a
+    213:213:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):824:824 -> a
     213:213:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):205 -> a
     214:217:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):205:208 -> a
     218:218:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):204:204 -> a
@@ -41164,7 +41383,7 @@
     238:238:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):215:215 -> a
     239:239:void lambda$synthesizeEmulateInterfaceLibraryClass$0(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
     240:240:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):278:278 -> a
-    241:241:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    241:241:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     241:241:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):278 -> a
     242:244:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):278:280 -> a
     245:249:void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceProcessor.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexProgramClass):138:142 -> a
@@ -41176,7 +41395,7 @@
     255:260:void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceProcessor.warnMissingEmulatedInterfaces():362 -> a
     255:260:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):288 -> a
     261:261:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):289:289 -> a
-    262:262:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    262:262:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     262:262:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):289 -> a
     263:270:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):290:297 -> a
     271:286:void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceProcessor.replaceInterfacesInEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):99:114 -> a
@@ -41195,10 +41414,10 @@
     313:318:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
     319:336:void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceProcessor.filterEmulatedInterfaceSubInterfaces(com.android.tools.r8.graph.DexApplication$Builder):322:339 -> a
     319:336:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):311 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringProcessor -> com.android.tools.r8.internal.li:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringProcessor -> com.android.tools.r8.internal.Gi:
     void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
     void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.mi:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.Hi:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -41210,330 +41429,316 @@
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
     java.util.Map cache -> h
     java.util.function.Predicate shouldIgnoreFromReportsPredicate -> i
-    1:1:void <clinit>():120:120 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):151:151 -> <init>
-    2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):134:159 -> <init>
+    1:1:void <clinit>():115:115 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):146:146 -> <init>
+    2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):129:154 -> <init>
     boolean lambda$rewriteInvokeToThrow$5(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):163:167 -> a
-    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):167:167 -> a
-    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):171:171 -> a
-    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):172:173 -> a
-    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):178:179 -> a
+    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):158:162 -> a
+    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):162:162 -> a
+    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):166:166 -> a
+    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:168 -> a
+    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):173:174 -> a
     12:12:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):180 -> a
-    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):180:181 -> a
-    15:20:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):183:188 -> a
-    21:25:void initializeEmulatedInterfaceVariables():196:200 -> a
-    26:30:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):213:217 -> a
-    26:30:void initializeEmulatedInterfaceVariables():199 -> a
-    31:31:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):216:216 -> a
-    31:31:void initializeEmulatedInterfaceVariables():199 -> a
-    32:32:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):214:214 -> a
-    32:32:void initializeEmulatedInterfaceVariables():199 -> a
-    33:37:void initializeEmulatedInterfaceVariables():201:205 -> a
-    38:38:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):222:222 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> a
-    39:39:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):223 -> a
-    40:42:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):223:225 -> a
-    43:43:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):224:224 -> a
-    44:44:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):222:222 -> a
-    45:51:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):233:239 -> a
-    52:52:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):243:243 -> a
-    53:57:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):252:256 -> a
-    58:61:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):255:258 -> a
-    62:98:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):268:304 -> a
-    99:101:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):531:533 -> a
-    99:101:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
+    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):175 -> a
+    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):175:176 -> a
+    15:20:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):178:183 -> a
+    21:25:void initializeEmulatedInterfaceVariables():191:195 -> a
+    26:30:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):208:212 -> a
+    26:30:void initializeEmulatedInterfaceVariables():194 -> a
+    31:31:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):211:211 -> a
+    31:31:void initializeEmulatedInterfaceVariables():194 -> a
+    32:32:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):209:209 -> a
+    32:32:void initializeEmulatedInterfaceVariables():194 -> a
+    33:37:void initializeEmulatedInterfaceVariables():196:200 -> a
+    38:38:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):217:217 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):824:824 -> a
+    39:39:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):218 -> a
+    40:42:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):218:220 -> a
+    43:43:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):219:219 -> a
+    44:44:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):217:217 -> a
+    45:51:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):228:234 -> a
+    52:52:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):238:238 -> a
+    53:57:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):247:251 -> a
+    58:61:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):250:253 -> a
+    62:98:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):263:299 -> a
+    99:101:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):526:528 -> a
+    99:101:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
     102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-    102:102:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):533 -> a
-    102:102:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    103:124:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):538:559 -> a
-    103:124:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
+    102:102:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528 -> a
+    102:102:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    103:124:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):533:554 -> a
+    103:124:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
     125:125:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    125:125:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):559 -> a
-    125:125:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    126:127:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):569:570 -> a
-    126:127:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    128:130:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884:886 -> a
-    128:130:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):570 -> a
-    128:130:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    131:133:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):571:573 -> a
-    131:133:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    134:134:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):893:893 -> a
-    134:134:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):573 -> a
-    134:134:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    135:136:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):574:575 -> a
-    135:136:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    137:147:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):571:581 -> a
-    137:147:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
+    125:125:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):554 -> a
+    125:125:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    126:127:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):564:565 -> a
+    126:127:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    128:130:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):879:881 -> a
+    128:130:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):565 -> a
+    128:130:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    131:133:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):566:568 -> a
+    131:133:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    134:134:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):888:888 -> a
+    134:134:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):568 -> a
+    134:134:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    135:136:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):569:570 -> a
+    135:136:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    137:147:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):566:576 -> a
+    137:147:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
     148:148: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):556:556 -> a
-    148:148:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):581 -> a
-    148:148:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    149:151:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):582:584 -> a
-    149:151:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
+    148:148:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):576 -> a
+    148:148:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    149:151:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):577:579 -> a
+    149:151:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
     152:152:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    152:152:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):584 -> a
-    152:152:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    153:159:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):584:590 -> a
-    153:159:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    160:174:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):586:600 -> a
-    160:174:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
+    152:152:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):579 -> a
+    152:152:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    153:159:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):579:585 -> a
+    153:159:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    160:174:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):581:595 -> a
+    160:174:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
     175:175: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):556:556 -> a
-    175:175:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):600 -> a
-    175:175:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
+    175:175:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):595 -> a
+    175:175:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
     176:176:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    176:176:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):601 -> a
-    176:176:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    177:181:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):605:609 -> a
-    177:181:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> a
-    182:182:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):611 -> a
-    182:182:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    183:184:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):611:612 -> a
-    183:184:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    185:192:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):610:617 -> a
-    185:192:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    193:198:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):616:621 -> a
-    193:198:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    199:199:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):620:620 -> a
-    199:199:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):303 -> a
-    200:200:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):293:293 -> a
-    201:225:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):292:316 -> a
-    226:240:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):630:644 -> a
-    226:240:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):315 -> a
+    176:176:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):596 -> a
+    176:176:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    177:181:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):600:604 -> a
+    177:181:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):824:824 -> a
+    182:182:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):606 -> a
+    182:182:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    183:184:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):606:607 -> a
+    183:184:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    185:192:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):605:612 -> a
+    185:192:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    193:198:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):611:616 -> a
+    193:198:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    199:199:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):615:615 -> a
+    199:199:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):298 -> a
+    200:200:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):288:288 -> a
+    201:225:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):287:311 -> a
+    226:240:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):625:639 -> a
+    226:240:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):310 -> a
     241:241:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    241:241:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):644 -> a
-    241:241:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):315 -> a
-    242:243:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):644:645 -> a
-    242:243:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):315 -> a
-    244:244:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
-    244:244:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):645 -> a
-    244:244:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):315 -> a
-    245:245:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):646:646 -> a
-    245:245:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):315 -> a
-    246:254:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):745:753 -> a
-    246:254:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):647 -> a
-    246:254:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):315 -> a
-    255:255:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):749:749 -> a
-    255:255:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):647 -> a
-    255:255:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):315 -> a
-    256:256:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289:289 -> a
-    257:262:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):348:353 -> a
-    257:262:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
+    241:241:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):639 -> a
+    241:241:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):310 -> a
+    242:243:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):639:640 -> a
+    242:243:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):310 -> a
+    244:244:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
+    244:244:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):640 -> a
+    244:244:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):310 -> a
+    245:245:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):641:641 -> a
+    245:245:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):310 -> a
+    246:254:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):740:748 -> a
+    246:254:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):642 -> a
+    246:254:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):310 -> a
+    255:255:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):744:744 -> a
+    255:255:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.code.InstructionListIterator):642 -> a
+    255:255:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):310 -> a
+    256:256:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284:284 -> a
+    257:262:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):343:348 -> a
+    257:262:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
     263:263:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    263:263:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):353 -> a
-    263:263:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    264:268:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):356:360 -> a
-    264:268:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
+    263:263:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):348 -> a
+    263:263:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    264:268:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):351:355 -> a
+    264:268:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
     269:269:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    269:269:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):364 -> a
-    269:269:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    270:278:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):372:380 -> a
-    270:278:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    279:279:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):910:910 -> a
-    279:279:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):381 -> a
-    279:279:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    280:280:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):906:906 -> a
-    280:280:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):910 -> a
-    280:280:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):381 -> a
-    280:280:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    281:283:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):382:384 -> a
-    281:283:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    284:302:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):378:396 -> a
-    284:302:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    303:311:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):392:400 -> a
-    303:311:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    312:316:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):365:369 -> a
-    312:316:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
+    269:269:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):359 -> a
+    269:269:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    270:278:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):367:375 -> a
+    270:278:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    279:279:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):905:905 -> a
+    279:279:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):376 -> a
+    279:279:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    280:280:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):901:901 -> a
+    280:280:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):905 -> a
+    280:280:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):376 -> a
+    280:280:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    281:283:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):377:379 -> a
+    281:283:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    284:302:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):373:391 -> a
+    284:302:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    303:311:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):387:395 -> a
+    303:311:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    312:316:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):360:364 -> a
+    312:316:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
     317:317:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     317:317:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    317:317:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):369 -> a
-    317:317:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    318:318:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):369:369 -> a
-    318:318:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):289 -> a
-    319:319:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):286:286 -> a
-    320:323:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):337:340 -> a
-    320:323:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):286 -> a
+    317:317:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):364 -> a
+    317:317:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    318:318:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):364:364 -> a
+    318:318:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):284 -> a
+    319:319:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):281:281 -> a
+    320:323:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):332:335 -> a
+    320:323:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):281 -> a
     324:324:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    324:324:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):340 -> a
-    324:324:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):286 -> a
-    325:325:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):341:341 -> a
-    325:325:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):286 -> a
-    326:329:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):325:328 -> a
+    324:324:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):335 -> a
+    324:324:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):281 -> a
+    325:325:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.graph.ProgramMethod):336:336 -> a
+    325:325:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):281 -> a
+    326:329:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):320:323 -> a
     330:330:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    330:330:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):328 -> a
-    331:334:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):328:331 -> a
-    335:342:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):414:421 -> a
+    330:330:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):323 -> a
+    331:334:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):323:326 -> a
+    335:342:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):409:416 -> a
     343:343:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-    343:343:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):421 -> a
-    344:353:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):426:435 -> a
+    343:343:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):416 -> a
+    344:353:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):421:430 -> a
     354:354:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    354:354:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):758 -> a
-    354:354:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):440 -> a
-    355:355:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):758:758 -> a
-    355:355:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):440 -> a
-    356:367:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):451:462 -> a
-    368:385:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):460:477 -> a
-    386:430:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):475:519 -> a
-    431:431:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):515:515 -> a
-    432:435:void lambda$rewriteInvokeStatic$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):465:468 -> a
-    436:439:com.android.tools.r8.graph.Code lambda$rewriteInvokeStatic$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):470:473 -> a
-    440:455:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):664:679 -> a
-    456:456:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
-    456:456:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):679 -> a
-    457:467:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):680:690 -> a
-    468:470:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):109:111 -> a
-    468:470:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):690 -> a
-    471:482:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):691:702 -> a
-    483:483:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):701:701 -> a
-    484:484:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):115:115 -> a
-    484:484:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):690 -> a
-    485:485:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):762:762 -> a
-    486:486:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    486:486:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):762 -> a
-    487:487:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):762:762 -> a
-    488:488:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
-    488:488:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):762 -> a
-    489:493:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):762:766 -> a
-    494:503:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):801:810 -> a
-    504:504:java.lang.String getCompanionClassDescriptor(java.lang.String):817:817 -> a
-    505:508:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):822:825 -> a
-    509:518:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):868:877 -> a
-    519:519:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):874:874 -> a
-    520:520:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):893:893 -> a
-    521:522:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):897:898 -> a
-    523:523:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):893:893 -> a
-    523:523:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):898 -> a
-    524:524:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):899:899 -> a
-    525:533:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):917:925 -> a
-    534:536:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.synthesizeEmptyCompanionClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):938:940 -> a
-    534:536:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):925 -> a
-    537:537:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.synthesizeEmptyCompanionClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):939:939 -> a
-    537:537:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):925 -> a
-    538:538:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):930:930 -> a
-    539:539:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    539:539:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):930 -> a
-    540:540:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):931:931 -> a
-    541:552:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.synthetizeCompanionClassMethodIfNotPresent(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexMethod):945:956 -> a
-    541:552:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):931 -> a
-    553:553:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
-    553:553:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271 -> a
-    553:553:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.synthetizeCompanionClassMethodIfNotPresent(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexMethod):956 -> a
-    553:553:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):931 -> a
-    554:564:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.synthetizeCompanionClassMethodIfNotPresent(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexMethod):949:959 -> a
-    554:564:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):931 -> a
-    565:588:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:994 -> a
-    589:590:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.clear():1001:1002 -> a
-    589:590:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    591:594:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor):1006:1009 -> a
-    591:594:boolean lambda$processClassesConcurrently$6(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.graph.DexProgramClass):1020 -> a
-    595:595:void processClassesConcurrently(java.util.List,com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1020:1020 -> a
-    596:596:void processClassesConcurrently(java.util.List,com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1019:1019 -> a
-    597:607:void processClassesConcurrently(java.util.List,com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1018:1028 -> a
-    608:609:void lambda$processClassesConcurrently$7(java.util.List,com.android.tools.r8.graph.DexProgramClass):1022:1023 -> a
-    610:624:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1041:1055 -> a
-    625:625:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1048:1048 -> a
-    626:630:java.util.function.Predicate getShouldIgnoreFromReportsPredicate(com.android.tools.r8.graph.AppView):1061:1065 -> a
-    631:640:java.util.function.Predicate getShouldIgnoreFromReportsPredicate(com.android.tools.r8.graph.AppView):1064:1073 -> a
-    641:642:boolean lambda$getShouldIgnoreFromReportsPredicate$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):1074:1075 -> a
-    643:643:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
-    643:643:boolean lambda$getShouldIgnoreFromReportsPredicate$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):1075 -> a
-    644:650:boolean lambda$getShouldIgnoreFromReportsPredicate$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):1076:1082 -> a
-    651:651:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1087:1087 -> a
-    651:651:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1102 -> a
-    652:655:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1105:1108 -> a
-    656:657:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1112:1113 -> a
-    658:658:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):843:843 -> a
-    658:658:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1114 -> a
-    659:660:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1116:1117 -> a
-    661:661:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    661:661:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1117 -> a
-    662:662:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1122:1122 -> a
-    663:664:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1133:1134 -> a
-    663:664:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    665:665:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1087:1087 -> a
-    665:665:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
-    665:665:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1136 -> a
-    665:665:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    666:666:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1096:1096 -> a
-    666:666:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1136 -> a
-    666:666:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    667:669:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1137:1139 -> a
-    667:669:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    670:670:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    670:670:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):758 -> a
-    670:670:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1148 -> a
-    670:670:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    671:671:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):758:758 -> a
-    671:671:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1148 -> a
-    671:671:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    672:698:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1153:1179 -> a
-    672:698:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    699:699:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1127:1127 -> a
-    700:704:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1140:1144 -> a
-    700:704:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    705:705:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    705:705:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1144 -> a
-    705:705:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    706:706:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1144:1144 -> a
-    706:706:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1126 -> a
-    707:707:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1184:1184 -> a
-    708:708:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    708:708:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1184 -> a
-    709:710:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1184:1185 -> a
-    711:711:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    711:711:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1185 -> a
-    712:713:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1185:1186 -> a
-    714:714:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    714:714:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1188 -> a
-    715:716:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1190:1191 -> a
-    717:717:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    717:717: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):1203 -> a
-    717:717:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1192 -> a
-    718:718: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):1205:1205 -> a
-    718:718:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1192 -> a
-    719:720:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1194:1195 -> a
-    721:721:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    721:721: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):1203 -> a
-    721:721:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1195 -> a
-    722:722: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):1205:1205 -> a
-    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1195 -> a
-    1:27:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):708:734 -> b
-    28:28:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isEmulatedInterface(com.android.tools.r8.graph.DexType):229:229 -> b
-    28:28:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):734 -> b
-    29:29:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):735:735 -> b
-    30:31:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):771:772 -> b
-    32:32:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> b
-    32:32:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):773 -> b
-    33:33:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):773:773 -> b
-    34:35:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):794:795 -> b
-    36:36:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):788:788 -> b
-    36:36:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):796 -> b
-    37:37:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):797:797 -> b
-    38:38:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):834:834 -> b
-    39:39:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):906:906 -> b
-    40:40:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1087:1087 -> b
-    40:40:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> b
-    41:41:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1096:1096 -> b
-    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):229:229 -> c
-    2:4:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):781:783 -> c
+    354:354:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):753 -> a
+    354:354:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):435 -> a
+    355:355:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):753:753 -> a
+    355:355:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):435 -> a
+    356:367:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):446:457 -> a
+    368:385:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):455:472 -> a
+    386:430:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):470:514 -> a
+    431:431:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):510:510 -> a
+    432:435:com.android.tools.r8.graph.Code lambda$rewriteInvokeStatic$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):465:468 -> a
+    436:451:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):659:674 -> a
+    452:452:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
+    452:452:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):674 -> a
+    453:463:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):675:685 -> a
+    464:466:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):109:111 -> a
+    464:466:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):685 -> a
+    467:478:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):686:697 -> a
+    479:479:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):696:696 -> a
+    480:480:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):115:115 -> a
+    480:480:boolean rewriteInvokeToThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):685 -> a
+    481:481:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):757:757 -> a
+    482:482:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    482:482:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):757 -> a
+    483:483:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):757:757 -> a
+    484:484:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
+    484:484:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):757 -> a
+    485:489:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):757:761 -> a
+    490:499:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):796:805 -> a
+    500:500:java.lang.String getCompanionClassDescriptor(java.lang.String):812:812 -> a
+    501:504:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):817:820 -> a
+    505:514:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):863:872 -> a
+    515:515:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):869:869 -> a
+    516:516:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):888:888 -> a
+    517:518:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):892:893 -> a
+    519:519:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):888:888 -> a
+    519:519:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):893 -> a
+    520:520:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):894:894 -> a
+    521:530:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):912:921 -> a
+    531:531:void recordCompanionClassReference(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):918:918 -> a
+    532:536:void lambda$recordCompanionClassReference$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):925:929 -> a
+    537:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):941:964 -> a
+    561:562:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.clear():971:972 -> a
+    561:562:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    563:566:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor):976:979 -> a
+    563:566:boolean lambda$processClassesConcurrently$7(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.graph.DexProgramClass):990 -> a
+    567:567:void processClassesConcurrently(java.util.List,com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
+    568:568:void processClassesConcurrently(java.util.List,com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):989:989 -> a
+    569:579:void processClassesConcurrently(java.util.List,com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):988:998 -> a
+    580:581:void lambda$processClassesConcurrently$8(java.util.List,com.android.tools.r8.graph.DexProgramClass):992:993 -> a
+    582:596:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1003:1017 -> a
+    597:597:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1010:1010 -> a
+    598:602:java.util.function.Predicate getShouldIgnoreFromReportsPredicate(com.android.tools.r8.graph.AppView):1023:1027 -> a
+    603:612:java.util.function.Predicate getShouldIgnoreFromReportsPredicate(com.android.tools.r8.graph.AppView):1026:1035 -> a
+    613:614:boolean lambda$getShouldIgnoreFromReportsPredicate$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):1036:1037 -> a
+    615:615:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
+    615:615:boolean lambda$getShouldIgnoreFromReportsPredicate$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):1037 -> a
+    616:622:boolean lambda$getShouldIgnoreFromReportsPredicate$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):1038:1044 -> a
+    623:623:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1049:1049 -> a
+    623:623:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1064 -> a
+    624:627:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1067:1070 -> a
+    628:629:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074:1075 -> a
+    630:630:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):838:838 -> a
+    630:630:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1076 -> a
+    631:632:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1078:1079 -> a
+    633:633:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
+    633:633:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1079 -> a
+    634:634:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1084:1084 -> a
+    635:636:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1095:1096 -> a
+    635:636:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    637:637:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1049:1049 -> a
+    637:637:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1055 -> a
+    637:637:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1098 -> a
+    637:637:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    638:638:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1058:1058 -> a
+    638:638:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1098 -> a
+    638:638:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    639:641:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1099:1101 -> a
+    639:641:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    642:642:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    642:642:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):753 -> a
+    642:642:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1110 -> a
+    642:642:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    643:643:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):753:753 -> a
+    643:643:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1110 -> a
+    643:643:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    644:670:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1115:1141 -> a
+    644:670:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    671:671:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1089:1089 -> a
+    672:676:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1106 -> a
+    672:676:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    677:677:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    677:677:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106 -> a
+    677:677:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    678:678:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1106 -> a
+    678:678:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1088 -> a
+    679:679:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1146:1146 -> a
+    680:680:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    680:680:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1146 -> a
+    681:682:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1146:1147 -> a
+    683:683:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    683:683:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1147 -> a
+    684:685:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1147:1148 -> a
+    686:686:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
+    686:686:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1150 -> a
+    687:688:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1152:1153 -> a
+    689:689:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
+    689:689: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):1165 -> a
+    689:689:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1154 -> a
+    690:690: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):1167:1167 -> a
+    690:690:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1154 -> a
+    691:692:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1156:1157 -> a
+    693:693:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
+    693:693: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):1165 -> a
+    693:693:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1157 -> a
+    694:694: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):1167:1167 -> a
+    694:694:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1157 -> a
+    1:4:void lambda$rewriteInvokeStatic$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):460:463 -> b
+    5:31:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):703:729 -> b
+    32:32:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isEmulatedInterface(com.android.tools.r8.graph.DexType):224:224 -> b
+    32:32:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):729 -> b
+    33:33:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):730:730 -> b
+    34:35:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):766:767 -> b
+    36:36:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> b
+    36:36:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):768 -> b
+    37:37:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):768:768 -> b
+    38:39:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):789:790 -> b
+    40:40:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):783:783 -> b
+    40:40:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):791 -> b
+    41:41:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):792:792 -> b
+    42:42:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> b
+    43:43:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):901:901 -> b
+    44:44:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1049:1049 -> b
+    44:44:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1055 -> b
+    45:45:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1058:1058 -> b
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):224:224 -> c
+    2:4:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):776:778 -> c
     5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> c
-    5:5:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):784 -> c
-    6:6:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):781:781 -> c
-    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):848:848 -> c
-    8:8:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):834:834 -> c
-    8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):848 -> c
-    9:14:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):848:853 -> c
-    1:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):858:860 -> d
+    5:5:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):779 -> c
+    6:6:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):776:776 -> c
+    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):843:843 -> c
+    8:8:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> c
+    8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):843 -> c
+    9:14:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):843:848 -> c
+    1:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):853:855 -> d
     4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):292:292 -> d
-    4:4:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):860 -> d
-    5:5:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):861:861 -> d
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.mi$a:
+    4:4:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):855 -> d
+    5:5:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):856:856 -> d
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Hi$a:
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
-    1:3:void <clinit>():146:148 -> <clinit>
-    1:1:void <init>(java.lang.String,int):144:144 -> <init>
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.ni:
+    1:3:void <clinit>():141:143 -> <clinit>
+    1:1:void <init>(java.lang.String,int):139:139 -> <init>
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Ii:
     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>
@@ -41550,7 +41755,7 @@
     23:23:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):47:47 -> a
     23:23:void run():36 -> a
     24:24:void run():35:35 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.pi:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.Ki:
     java.util.Map postProcessingInterfaceInfos -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter rewriter -> b
@@ -41560,244 +41765,284 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter):82:82 -> <init>
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter):76:84 -> <init>
     long lambda$getChecksumSupplier$3(long,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):89:94 -> a
-    7:14:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):149:156 -> a
-    7:14:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    15:15:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):197:197 -> a
-    15:15:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158 -> a
-    15:15:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):197 -> a
-    16:16:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158 -> a
-    16:16:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):198:198 -> a
-    17:17:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158 -> a
-    17:17:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClinitMethod(com.android.tools.r8.graph.DexType):2462:2462 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):198 -> a
-    18:18:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158 -> a
-    18:18:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    19:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):199:206 -> a
-    19:26:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158 -> a
-    19:26:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    27:42:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):204:219 -> a
-    27:42:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158 -> a
-    27:42:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    43:43:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):219 -> a
-    43:43:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158 -> a
-    43:43:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    44:44:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):158:158 -> a
-    44:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):96 -> a
-    45:47:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):224:226 -> a
-    45:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    48:59:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):373:384 -> a
-    48:59:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):227 -> a
-    48:59:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    60:72:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):236:248 -> a
-    60:72:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    73:80:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):247:254 -> a
-    73:80:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    81:81:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
-    81:81:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):254 -> a
-    81:81:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    82:85:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):258:261 -> a
-    82:85:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    86:87:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):240:241 -> a
-    86:87:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    88:88:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    88:88:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):241 -> a
-    88:88:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    89:89:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):241:241 -> a
-    89:89:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    90:93:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):228:231 -> a
-    90:93:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    94:94:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    94:94:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):231 -> a
-    94:94:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    95:129:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):231:265 -> a
-    95:129:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):99 -> a
-    130:149:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):273:292 -> a
-    130:149:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    150:154:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):437:441 -> a
-    150:154:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):293 -> a
-    150:154:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    155:169:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):294:308 -> a
-    155:169:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    170:170:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
-    170:170:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):308 -> a
-    170:170:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    171:183:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):310:322 -> a
-    171:183:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    184:201:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):321:338 -> a
-    184:201:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    202:202:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
-    202:202:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):338 -> a
-    202:202:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    203:205:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):342:344 -> a
-    203:205:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    206:209:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):326:329 -> a
-    206:209:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    210:210:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):329 -> a
-    210:210:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    211:211:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):329:329 -> a
-    211:211:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    212:212:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):438:438 -> a
-    212:212:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):293 -> a
-    212:212:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    213:215:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):348:350 -> a
-    213:215:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):103 -> a
-    216:230:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):105:119 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> a
-    231:231:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):119 -> a
-    232:255:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):120:143 -> a
-    256:256:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$0(com.android.tools.r8.graph.DexEncodedMethod):165:165 -> a
-    257:257:boolean lambda$findExistingStaticClinitFieldToTriggerInterfaceInitialization$1(com.android.tools.r8.graph.DexEncodedField):173:173 -> a
-    258:266:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):181:189 -> a
-    267:267:com.android.tools.r8.graph.FieldAccessFlags$Builder com.android.tools.r8.graph.FieldAccessFlags.builder():48:48 -> a
-    267:267:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):189 -> a
-    268:270:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):189:191 -> a
-    271:271:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean):73:73 -> a
-    271:271:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):63 -> a
-    271:271:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):191 -> a
-    272:272:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):186:186 -> a
-    273:284:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):403:414 -> a
-    285:287:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):393:395 -> a
-    285:287:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):414 -> a
-    288:294:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):415:421 -> a
-    295:299:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):428:432 -> a
-    300:300:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():446:446 -> a
-    301:301:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():636:636 -> a
-    301:301:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():446 -> a
-    302:323:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():447:468 -> a
-    324:324:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):449:449 -> a
-    325:328:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.clearDirectMethods(com.android.tools.r8.graph.DexProgramClass):355:358 -> a
-    325:328:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):450 -> a
-    329:329:void com.android.tools.r8.graph.MethodCollection.setSingleDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
-    329:329:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.clearDirectMethods(com.android.tools.r8.graph.DexProgramClass):358 -> a
-    329:329:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):450 -> a
-    330:330:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.clearDirectMethods(com.android.tools.r8.graph.DexProgramClass):360:360 -> a
-    330:330:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):450 -> a
-    331:343:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):452:464 -> a
-    344:357:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.removeBridges(com.android.tools.r8.graph.DexProgramClass):472:485 -> a
-    344:357:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):465 -> a
-    358:360:void lambda$postProcessInterfaces$4(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):456:458 -> a
-    361:361:void lambda$postProcessInterfaces$4(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):457:457 -> a
-    362:373:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):494:505 -> a
-    374:375:void lambda$finalizeProcessing$6(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):502:503 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):173:173 -> b
-    2:2:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):327:327 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):173 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):173:173 -> b
-    1:5:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):365:369 -> c
-    1:1:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo getPostProcessingInterfaceInfo(com.android.tools.r8.graph.DexProgramClass):509:509 -> d
-    1:4:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):162:165 -> e
-    1:1:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo lambda$getPostProcessingInterfaceInfo$7(com.android.tools.r8.graph.DexProgramClass):510:510 -> f
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.pi$a:
+    1:1:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):89:89 -> a
+    2:5:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.analyzeBridges(com.android.tools.r8.graph.DexProgramClass):99:102 -> a
+    2:5:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):92 -> a
+    6:17:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.needsCompanionClass(com.android.tools.r8.graph.DexProgramClass):109:120 -> a
+    6:17:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):93 -> a
+    18:18:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):130:130 -> a
+    18:18:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    19:26:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):183:190 -> a
+    19:26:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    19:26:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):231:231 -> a
+    27:27:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192 -> a
+    27:27:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    27:27:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):824:824 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):231 -> a
+    28:28:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192 -> a
+    28:28:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    28:28:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):232:232 -> a
+    29:29:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192 -> a
+    29:29:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    29:29:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClinitMethod(com.android.tools.r8.graph.DexType):2488:2488 -> a
+    30:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):232 -> a
+    30:30:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192 -> a
+    30:30:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    30:30:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    31:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):233:240 -> a
+    31:38:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192 -> a
+    31:38:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    31:38:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    39:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):238:253 -> a
+    39:54:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192 -> a
+    39:54:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    39:54:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    55:55:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
+    55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):253 -> a
+    55:55:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192 -> a
+    55:55:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    55:55:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    56:56:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):192:192 -> a
+    56:56:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):132 -> a
+    56:56:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    57:59:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):258:260 -> a
+    57:59:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    57:59:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    60:71:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):397:408 -> a
+    60:71:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):261 -> a
+    60:71:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    60:71:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    72:84:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):270:282 -> a
+    72:84:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    72:84:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    85:92:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):281:288 -> a
+    85:92:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    85:92:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    93:93:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
+    93:93:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):288 -> a
+    93:93:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    93:93:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    94:97:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):292:295 -> a
+    94:97:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    94:97:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    98:99:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):274:275 -> a
+    98:99:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    98:99:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    100:100:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):275 -> a
+    100:100:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    100:100:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    101:101:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):275:275 -> a
+    101:101:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    101:101:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    102:105:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):262:265 -> a
+    102:105:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    102:105:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> 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.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):265 -> a
+    106:106:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    106:106:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    107:107:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):265:265 -> a
+    107:107:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    107:107:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    108:128:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):302:322 -> a
+    108:128:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    108:128:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    129:133:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):461:465 -> a
+    129:133:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):323 -> a
+    129:133:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    129:133:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    134:148:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):324:338 -> a
+    134:148:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    134:148:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    149:149:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
+    149:149:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):338 -> a
+    149:149:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    149:149:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    150:162:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):340:352 -> a
+    150:162:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    150:162:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    163:180:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):351:368 -> a
+    163:180:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    163:180:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    181:181:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):271:271 -> a
+    181:181:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):368 -> a
+    181:181:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    181:181:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    182:184:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):372:374 -> a
+    182:184:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    182:184:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    185:188:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):356:359 -> a
+    185:188:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    185:188:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    189:189:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    189:189:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):359 -> a
+    189:189:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    189:189:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    190:190:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):359:359 -> a
+    190:190:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    190:190:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    191:191:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):462:462 -> a
+    191:191:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):323 -> a
+    191:191:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):139 -> a
+    191:191:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    192:204:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):141:153 -> a
+    192:204:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    205:205:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):824:824 -> a
+    205:205:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):153 -> a
+    205:205:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    206:229:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.synthesizeCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):154:177 -> a
+    206:229:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):94 -> a
+    230:230:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$0(com.android.tools.r8.graph.DexEncodedMethod):199:199 -> a
+    231:231:boolean lambda$findExistingStaticClinitFieldToTriggerInterfaceInitialization$1(com.android.tools.r8.graph.DexEncodedField):207:207 -> a
+    232:240:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):215:223 -> a
+    241:241:com.android.tools.r8.graph.FieldAccessFlags$Builder com.android.tools.r8.graph.FieldAccessFlags.builder():48:48 -> a
+    241:241:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):223 -> a
+    242:244:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):223:225 -> a
+    245:245:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean):73:73 -> a
+    245:245:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):63 -> a
+    245:245:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):225 -> a
+    246:246:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):220:220 -> a
+    247:258:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):427:438 -> a
+    259:261:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):417:419 -> a
+    259:261:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):438 -> a
+    262:268:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):439:445 -> a
+    269:273:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):452:456 -> a
+    274:274:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():470:470 -> a
+    275:275:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():660:660 -> a
+    275:275:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():470 -> a
+    276:297:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():471:492 -> a
+    298:298:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):473:473 -> a
+    299:302:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.clearDirectMethods(com.android.tools.r8.graph.DexProgramClass):379:382 -> a
+    299:302:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):474 -> a
+    303:303:void com.android.tools.r8.graph.MethodCollection.setSingleDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
+    303:303:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.clearDirectMethods(com.android.tools.r8.graph.DexProgramClass):382 -> a
+    303:303:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):474 -> a
+    304:304:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.clearDirectMethods(com.android.tools.r8.graph.DexProgramClass):384:384 -> a
+    304:304:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):474 -> a
+    305:317:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):476:488 -> a
+    318:331:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.removeBridges(com.android.tools.r8.graph.DexProgramClass):496:509 -> a
+    318:331:void lambda$postProcessInterfaces$5(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):489 -> a
+    332:334:void lambda$postProcessInterfaces$4(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):480:482 -> a
+    335:335:void lambda$postProcessInterfaces$4(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):481:481 -> a
+    336:347:void finalizeProcessing(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet):518:529 -> a
+    348:349:void lambda$finalizeProcessing$6(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):526:527 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):207:207 -> b
+    2:2:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):331:331 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):207 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):207:207 -> b
+    1:5:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):389:393 -> c
+    1:1:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo getPostProcessingInterfaceInfo(com.android.tools.r8.graph.DexProgramClass):533:533 -> d
+    1:4:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):196:199 -> e
+    1:1:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo lambda$getPostProcessingInterfaceInfo$7(com.android.tools.r8.graph.DexProgramClass):534:534 -> f
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.Ki$a:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap extraNewMethodSignatures -> n
-    1:1:void <clinit>():569:569 -> <clinit>
-    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):579:580 -> <init>
+    1:1:void <clinit>():593:593 -> <clinit>
+    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):603:604 -> <init>
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens asInterfaceProcessorLens() -> a
-    1:1:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):584:584 -> a
+    1:1:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):608:608 -> a
     2:2:boolean com.android.tools.r8.graph.GraphLens.isInterfaceProcessorLens():0:0 -> a
-    2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):584 -> a
-    3:11:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):585:593 -> a
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):625:625 -> f
+    2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):608 -> a
+    3:11:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):609:617 -> a
+    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):649:649 -> f
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> f
-    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):626 -> f
-    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):626:626 -> f
+    2:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):650 -> f
+    3:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):650:650 -> f
     4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):20:20 -> f
-    4:4:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):625 -> f
-    5:5:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):625:625 -> f
-    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):631:631 -> g
+    4:4:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):649 -> f
+    5:5:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):649:649 -> f
+    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):655:655 -> g
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):27:27 -> g
-    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):632 -> g
-    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):632:632 -> g
+    2:2:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):656 -> g
+    3:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):656:656 -> g
     4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):27:27 -> g
-    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):631 -> g
-    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):631:631 -> g
-    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():605:605 -> l
-    1:3:void toggleMappingToExtraMethods():598:600 -> m
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.oi:
+    4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):655 -> g
+    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):655:655 -> g
+    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():629:629 -> l
+    1:3:void toggleMappingToExtraMethods():622:624 -> m
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Ji:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraNewMethodSignatures -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():639:639 -> <clinit>
-    1:3:void <init>():639:641 -> <init>
-    1:4:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.AppView):652:655 -> a
-    1:3:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):645:647 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.qi:
+    1:1:void <clinit>():663:663 -> <clinit>
+    1:3:void <init>():663:665 -> <init>
+    1:4:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.AppView):676:679 -> a
+    1:3:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):669:671 -> b
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.Li:
     java.util.Map defaultMethodsToImplementation -> a
     java.util.Map methodsToMove -> b
     boolean hasNonClinitDirectMethods -> c
     boolean hasBridgesToRemove -> d
-    1:1:void <init>():513:513 -> <init>
-    1:4:void mapDefaultMethodToCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):521:524 -> a
-    5:5:java.util.Map getDefaultMethodsToImplementation():528:528 -> a
-    6:9:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):536:539 -> a
-    1:1:java.util.Map getMethodsToMove():543:543 -> b
-    1:1:boolean hasBridgesToRemove():559:559 -> c
-    1:1:boolean hasDefaultMethodsToImplementationMap():532:532 -> d
-    1:1:boolean hasMethodsToMove():547:547 -> e
-    1:1:boolean hasNonClinitDirectMethods():551:551 -> f
-    1:1:void setHasBridgesToRemove():563:563 -> g
-    1:1:void setHasNonClinitDirectMethods():555:555 -> h
-com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.kd:
+    1:1:void <init>():537:537 -> <init>
+    1:4:void mapDefaultMethodToCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):545:548 -> a
+    5:5:java.util.Map getDefaultMethodsToImplementation():552:552 -> a
+    6:9:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):560:563 -> a
+    1:1:java.util.Map getMethodsToMove():567:567 -> b
+    1:1:boolean hasBridgesToRemove():583:583 -> c
+    1:1:boolean hasDefaultMethodsToImplementationMap():556:556 -> d
+    1:1:boolean hasMethodsToMove():571:571 -> e
+    1:1:boolean hasNonClinitDirectMethods():575:575 -> f
+    1:1:void setHasBridgesToRemove():587:587 -> g
+    1:1:void setHasNonClinitDirectMethods():579:579 -> h
+com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.ld:
     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.go:
+com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.Do:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     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.LambdaDesugaringEventConsumer -> com.android.tools.r8.internal.ho:
+com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer -> com.android.tools.r8.internal.Eo:
     void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.io:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.Fo:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set directTargetedLambdaImplementationMethods -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView):52:52 -> <init>
-    2:10:void <init>(com.android.tools.r8.graph.AppView):45:53 -> <init>
-    1:2:boolean isDirectTargetedLambdaImplementationMethod(com.android.tools.r8.graph.DexMethodHandle):48:49 -> a
-    3:8:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):58:63 -> a
-    9:9: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):77:77 -> a
+    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:8:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):59:64 -> a
+    9:9: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.graph.DexItemFactory):79:79 -> a
     10:10:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> 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):77 -> a
-    11:11: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):79:79 -> a
-    12:12: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):78:78 -> a
-    13:28:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):96:111 -> 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.graph.DexItemFactory):79 -> a
+    11:11: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.graph.DexItemFactory):81:81 -> a
+    12:12: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.graph.DexItemFactory):80:80 -> a
+    13:28:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):98:113 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaClass.getType():120:120 -> a
-    29:29:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):111 -> a
-    30:45:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):111:126 -> a
-    46:49:void lambda$desugarInvokeDynamicInstruction$0(com.android.tools.r8.ir.desugar.FreshLocalProvider,java.util.Deque,com.android.tools.r8.graph.DexType):115:118 -> a
-    50:62:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):137:149 -> a
-    63:70:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):146:153 -> a
-    71:71:void lambda$createLambdaClass$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):150:150 -> a
-    72:72:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):159:159 -> a
+    29:29:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113 -> a
+    30:45:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113:128 -> a
+    46:49:void lambda$desugarInvokeDynamicInstruction$0(com.android.tools.r8.ir.desugar.FreshLocalProvider,java.util.Deque,com.android.tools.r8.graph.DexType):117:120 -> a
+    50:62:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):139:151 -> a
+    63:70:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):148:155 -> a
+    71:71:void lambda$createLambdaClass$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):152:152 -> a
+    72:72:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):161:161 -> a
     73:73:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    73:73:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):159 -> a
-    74:75:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):161:162 -> a
-    76:76:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.b9:
+    73:73:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):161 -> a
+    74:75:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):163:164 -> a
+    76:76:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):162:162 -> a
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.c9:
     1:1:void <init>(com.android.tools.r8.graph.AppView):36:36 -> <init>
     1:1:void reportDesugarDependencies():40:40 -> a
     2:9:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42:49 -> a
     10:10:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):43:43 -> a
     11:11:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54:54 -> a
-    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):818:818 -> a
+    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):821:821 -> a
     12:12:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> a
-    13:13:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):820 -> a
+    13:13:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
+    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):823 -> a
     13:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> a
-    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):820:820 -> a
+    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):823:823 -> a
     14:14:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> a
-    15:17:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):824:826 -> a
-    15:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):820 -> a
+    15:17:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):827:829 -> a
+    15:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):823 -> a
     15:17:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> a
-    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):820:820 -> a
+    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):823:823 -> a
     18:18:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> a
-    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):818:818 -> a
+    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):821:821 -> a
     19:19:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> a
     20:21:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.MethodProcessor,java.util.concurrent.ExecutorService):60:61 -> a
     22:22:void com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.forEachNest(java.util.function.Consumer):84:84 -> a
@@ -41819,13 +42064,13 @@
     54:54:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):97 -> a
     55:55:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):22:22 -> a
     55:55:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):97 -> a
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.Z8:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.a9:
     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):70:70 -> <init>
     1:1:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):74:74 -> a
     1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):79:79 -> b
     1:1:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):84:84 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.a9:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.b9:
     com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> e
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer eventConsumer -> c
     com.android.tools.r8.graph.ClasspathMethod context -> d
@@ -41851,7 +42096,7 @@
     6:6:void registerInvoke(com.android.tools.r8.graph.DexMethod):126 -> f
     7:9:void registerInvoke(com.android.tools.r8.graph.DexMethod):126:128 -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):174:174 -> g
-com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.ps:
+com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.Is:
     com.android.tools.r8.graph.DexClass hostClass -> a
     java.util.List members -> b
     java.util.List missingMembers -> c
@@ -41865,7 +42110,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.qs:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.Js:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map syntheticNestConstructorTypes -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -41874,35 +42119,35 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):69:69 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView):67:71 -> <init>
     1:1:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
-    1:1:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):221 -> a
-    2:2:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):222:222 -> a
-    3:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureFieldAccessBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):233:248 -> a
-    3:18:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):222 -> a
+    1:1:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):222 -> a
+    2:2:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):223:223 -> a
+    3:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureFieldAccessBridge(com.android.tools.r8.graph.ProgramField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):234:249 -> a
+    3:18:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):223 -> a
     19:19:boolean com.android.tools.r8.graph.DexClassAndField.isClasspathField():0:0 -> a
-    19:19:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):224 -> a
-    20:22:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):225:227 -> a
+    19:19:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):225 -> a
+    20:22:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):226:228 -> a
     23:23:boolean com.android.tools.r8.graph.DexClassAndField.isLibraryField():0:0 -> a
-    23:23:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):227 -> a
-    24:25:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):227:228 -> a
+    23:23:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):228 -> a
+    24:25:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):228:229 -> a
     26:26:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    26:26:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):283 -> a
-    27:27:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):284:284 -> a
-    28:36:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):295:303 -> a
-    28:36:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):284 -> a
-    37:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):302:305 -> a
-    37:40:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):284 -> a
-    41:48:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):304:311 -> a
-    41:48:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):284 -> a
+    26:26:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):284 -> a
+    27:27:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):285:285 -> a
+    28:36:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):296:304 -> a
+    28:36:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):285 -> a
+    37:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):303:306 -> a
+    37:40:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):285 -> a
+    41:48:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.ensureMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):305:312 -> a
+    41:48:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):285 -> a
     49:49:boolean com.android.tools.r8.graph.DexClassAndMethod.isClasspathMethod():0:0 -> a
-    49:49:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):286 -> a
-    50:52:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):287:289 -> a
+    49:49:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):287 -> a
+    50:52:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):288:290 -> a
     53:53:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    53:53:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):289 -> a
-    54:55:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):289:290 -> a
+    53:53:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):290 -> a
+    54:55:com.android.tools.r8.graph.DexMethod ensureMethodBridge(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):290:291 -> a
     void lambda$getMethodBridgeReference$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder) -> a
     56:56:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):75:75 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1472:1472 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():502 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1483:1483 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():505 -> a
     57:57:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):75 -> a
     58:60:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):76:78 -> a
     61:69:void forEachNest(java.util.function.Consumer,java.util.function.Consumer):88:96 -> a
@@ -41915,291 +42160,291 @@
     80:80:boolean needsDesugaring(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):134 -> a
     81:82:boolean needsDesugaring(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):135:136 -> a
     83:86:boolean needsDesugaring(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClassAndMethod):140:143 -> a
-    87:87: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):154:154 -> a
+    87:87: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.graph.DexItemFactory):155:155 -> a
     88:88:boolean com.android.tools.r8.cf.code.CfInstruction.isFieldInstruction():0:0 -> a
-    88:88: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):154 -> a
-    89:89: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):155:155 -> a
-    90:90: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):171:171 -> a
-    90:90: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):155 -> a
+    88:88: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.graph.DexItemFactory):155 -> a
+    89:89: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.graph.DexItemFactory):156:156 -> a
+    90:90: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):172:172 -> a
+    90:90: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.graph.DexItemFactory):156 -> a
     91:91:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    91:91: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):171 -> a
-    91:91: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):155 -> a
-    92:99: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):172:179 -> a
-    92:99: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):155 -> a
-    100:100: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):178:178 -> a
-    100:100: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):155 -> a
-    101:103: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):157:159 -> a
-    104:112:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):187:195 -> a
-    104:112: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):158 -> a
+    91:91: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):172 -> a
+    91:91: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.graph.DexItemFactory):156 -> a
+    92:99: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):173:180 -> a
+    92:99: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.graph.DexItemFactory):156 -> a
+    100:100: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):179:179 -> a
+    100:100: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.graph.DexItemFactory):156 -> a
+    101:103: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.graph.DexItemFactory):158:160 -> a
+    104:112:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):188:196 -> a
+    104:112: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.graph.DexItemFactory):159 -> a
     113:113:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    113:113:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):195 -> a
-    113:113: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):158 -> a
-    114:128:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):196:210 -> a
-    114:128: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):158 -> a
-    129:129:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):214:214 -> a
+    113:113:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):196 -> a
+    113:113: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.graph.DexItemFactory):159 -> a
+    114:128:java.util.List com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):197:211 -> a
+    114:128: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.graph.DexItemFactory):159 -> a
+    129:129:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):215:215 -> a
     130:130:com.android.tools.r8.ir.desugar.nest.Nest com.android.tools.r8.ir.desugar.nest.Nest.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):29:29 -> a
-    130:130:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):214 -> a
-    131:132:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):215:216 -> a
-    133:144:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):253:264 -> a
-    145:154:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):269:278 -> a
-    145:154:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):264 -> a
+    130:130:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):215 -> a
+    131:132:java.lang.RuntimeException reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):216:217 -> a
+    133:144:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):254:265 -> a
+    145:154:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):270:279 -> a
+    145:154:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):265 -> a
     155:155:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> a
-    155:155:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):278 -> a
-    155:155:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):264 -> a
-    156:156:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):278:278 -> a
-    156:156:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):264 -> a
-    157:157:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):263:263 -> a
-    158:161:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):316:319 -> a
-    162:192:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):318:348 -> a
-    193:196:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):353:356 -> a
-    193:196:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):348 -> a
+    155:155:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):279 -> a
+    155:155:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):265 -> a
+    156:156:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getFieldAccessBridgeName(com.android.tools.r8.graph.DexClassAndField,boolean):279:279 -> a
+    156:156:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):265 -> a
+    157:157:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):264:264 -> a
+    158:161:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):317:320 -> a
+    162:192:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):319:349 -> a
+    193:196:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):354:357 -> a
+    193:196:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):349 -> a
     197:197:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():44:44 -> a
-    197:197:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):356 -> a
-    197:197:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):348 -> a
-    198:198:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):356:356 -> a
-    198:198:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):348 -> a
-    199:199:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):348:348 -> a
-    200:200:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):321:321 -> a
+    197:197:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):357 -> a
+    197:197:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):349 -> a
+    198:198:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):357:357 -> a
+    198:198:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):349 -> a
+    199:199:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):349:349 -> a
+    200:200:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):322:322 -> a
     201:201:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    201:201:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):321 -> a
-    202:206:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):322:326 -> a
-    207:214:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):324:331 -> a
+    201:201:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):322 -> a
+    202:206:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):323:327 -> a
+    207:214:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):325:332 -> a
     215:215:boolean com.android.tools.r8.graph.DexClassAndMethod.isClasspathMethod():0:0 -> a
-    215:215:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):331 -> a
-    216:221:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):331:336 -> a
-    222:226:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):334:338 -> a
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.rs:
+    215:215:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):332 -> a
+    216:221:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):332:337 -> a
+    222:226:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):335:339 -> a
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.Ks:
     void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> b
     void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.FD:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.gE:
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b
     java.util.Map paramTypeToAppendMethod -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):55:55 -> <init>
     2:17:void <init>(com.android.tools.r8.graph.AppView):53:68 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory access$000(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):48:48 -> a
-    2:2: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):79:79 -> a
+    2:2: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.graph.DexItemFactory):80:80 -> a
     3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    3:3: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):79 -> a
-    4: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):82:86 -> a
-    9:19:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):102:112 -> a
-    9:19: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):87 -> a
-    20:27:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):109:116 -> a
-    20:27: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):87 -> a
-    28:28: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):89:89 -> a
-    29:30:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):124:125 -> a
-    29:30: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):90 -> a
+    3:3: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.graph.DexItemFactory):80 -> a
+    4: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.graph.DexItemFactory):83:87 -> a
+    9:19:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):103:113 -> a
+    9:19: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.graph.DexItemFactory):88 -> a
+    20:27:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):110:117 -> a
+    20:27: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.graph.DexItemFactory):88 -> a
+    28:28: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.graph.DexItemFactory):90:90 -> a
+    29:30:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):125:126 -> a
+    29:30: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.graph.DexItemFactory):91 -> a
     31:31:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
-    31:31:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):126 -> a
-    31:31: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):90 -> a
-    32:65:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):127:160 -> a
-    32:65: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):90 -> a
-    66:78:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):159:171 -> a
-    66:78: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):90 -> a
-    79:79:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):168:168 -> a
-    79:79: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):90 -> a
-    80:94:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):164:178 -> a
-    80:94: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):90 -> a
-    95:96:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):234:235 -> a
-    95:96:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):178 -> a
-    95:96: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):90 -> a
-    97:97:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):178:178 -> a
-    97:97: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):90 -> a
-    98:101:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):237:237 -> a
-    98:101:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):178 -> a
-    98:101: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):90 -> a
-    102:135:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):176:209 -> a
-    102:135: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):90 -> a
-    136:141:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):208:213 -> a
-    136:141: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):90 -> a
-    142:150:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):195:195 -> a
-    142:150: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):90 -> a
-    151:158:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):185:185 -> a
-    151:158: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):90 -> a
-    159:159:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):137:137 -> a
-    159:159: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):90 -> a
-    160:160:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):131:131 -> a
-    160:160: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):90 -> a
-    161:161:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):218:218 -> a
+    31:31:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):127 -> a
+    31:31: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.graph.DexItemFactory):91 -> a
+    32:65:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):128:161 -> a
+    32:65: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.graph.DexItemFactory):91 -> a
+    66:78:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):160:172 -> a
+    66:78: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.graph.DexItemFactory):91 -> a
+    79:79:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):169:169 -> a
+    79:79: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.graph.DexItemFactory):91 -> a
+    80:94:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):165:179 -> a
+    80:94: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.graph.DexItemFactory):91 -> a
+    95:96:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):235:236 -> a
+    95:96:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):179 -> a
+    95:96: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.graph.DexItemFactory):91 -> a
+    97:97:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):179:179 -> a
+    97:97: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.graph.DexItemFactory):91 -> a
+    98:101:java.lang.String com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):238:238 -> a
+    98:101:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):179 -> a
+    98:101: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.graph.DexItemFactory):91 -> a
+    102:135:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):177:210 -> a
+    102:135: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.graph.DexItemFactory):91 -> a
+    136:141:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):209:214 -> a
+    136:141: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.graph.DexItemFactory):91 -> a
+    142:150:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):196:196 -> a
+    142:150: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.graph.DexItemFactory):91 -> a
+    151:158:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):186:186 -> a
+    151:158: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.graph.DexItemFactory):91 -> a
+    159:159:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):138:138 -> a
+    159:159: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.graph.DexItemFactory):91 -> a
+    160:160:java.util.Collection com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):132:132 -> a
+    160:160: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.graph.DexItemFactory):91 -> a
+    161:161:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):219:219 -> a
     162:162:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    162:162:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):218 -> a
-    163:163:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):219:219 -> a
-    164:166:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.needsDesugaring(com.android.tools.r8.graph.DexCallSite):225:227 -> a
-    164:166:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):219 -> a
-    167:169:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):413:415 -> a
+    162:162:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):219 -> a
+    163:163:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):220:220 -> a
+    164:166:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring.needsDesugaring(com.android.tools.r8.graph.DexCallSite):226:228 -> a
+    164:166:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):220 -> a
+    167:169:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):414:416 -> a
     170:170:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    170:170:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):415 -> a
+    170:170:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):416 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):48:48 -> b
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.cE:
     int variableIndex -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,int):369:370 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,int):370:371 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk() -> a
-    1:1:int getVariableIndex():374:374 -> d
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.CD:
+    1:1:int getVariableIndex():375:375 -> d
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.dE:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <clinit>():330:330 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):334:335 -> <init>
+    1:1:void <clinit>():331:331 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):335:336 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk() -> a
-    1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk):330:330 -> a
+    1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk):331:331 -> a
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk() -> b
-    1:1:com.android.tools.r8.ir.code.ValueType getValueType():343:343 -> c
+    1:1:com.android.tools.r8.ir.code.ValueType getValueType():344:344 -> c
     2:2:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> c
-    2:2:com.android.tools.r8.ir.code.ValueType getValueType():343 -> c
-    3:4:com.android.tools.r8.ir.code.ValueType getValueType():343:344 -> c
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.DD:
+    2:2:com.android.tools.r8.ir.code.ValueType getValueType():344 -> c
+    3:4:com.android.tools.r8.ir.code.ValueType getValueType():344:345 -> c
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.eE:
     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
     boolean $assertionsDisabled -> f
     int argumentChunksStackSize -> d
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk firstConstantChunk -> c
-    1:1:void <clinit>():242:242 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):250:250 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):244:248 -> <init>
-    1:6:void addChunk(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk):253:258 -> a
-    7:9:void addChunk(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk):263:265 -> a
-    10:12:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):287:289 -> a
+    1:1:void <clinit>():243:243 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):251:251 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):245:249 -> <init>
+    1:6:void addChunk(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk):254:259 -> a
+    7:9:void addChunk(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk):264:266 -> a
+    10:12:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):288:290 -> a
     13:13:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk.isArgumentChunk():0:0 -> a
-    13:13:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):289 -> a
-    14:16:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):290:292 -> a
-    17:24:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):291:298 -> a
-    25:28:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):297:300 -> a
+    13:13:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):290 -> a
+    14:16:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):291:293 -> a
+    17:24:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):292:299 -> a
+    25:28:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):298:301 -> a
     29:29:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk.isArgumentChunk():0:0 -> a
-    29:29:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):300 -> a
-    30:32:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):301:303 -> a
-    33:36:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):302:305 -> a
+    29:29:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):301 -> a
+    30:32:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):302:304 -> a
+    33:36:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):303:306 -> a
     37:37:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk.isConstantChunk():0:0 -> a
-    37:37:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):305 -> a
-    38:54:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):305:321 -> a
-    55:59:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):319:323 -> a
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.ED:
+    37:37:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):306 -> a
+    38:54:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):306:322 -> a
+    55:59:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):320:324 -> a
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.fE:
     com.android.tools.r8.graph.DexString stringConstant -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):393:394 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):394:395 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk() -> b
-    1:1:com.android.tools.r8.graph.DexString getStringConstant():398:398 -> d
-com.android.tools.r8.ir.desugar.twr.TwrCloseResourceDesugaringEventConsumer -> com.android.tools.r8.internal.kF:
+    1:1:com.android.tools.r8.graph.DexString getStringConstant():399:399 -> d
+com.android.tools.r8.ir.desugar.twr.TwrCloseResourceDesugaringEventConsumer -> com.android.tools.r8.internal.LF:
     void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.desugar.twr.TwrCloseResourceInstructionDesugaring -> com.android.tools.r8.internal.lF:
+com.android.tools.r8.ir.desugar.twr.TwrCloseResourceInstructionDesugaring -> com.android.tools.r8.internal.MF:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto twrCloseResourceProto -> c
     1:5:void <init>(com.android.tools.r8.graph.AppView):32:36 -> <init>
-    1:16: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):48:63 -> a
-    17:22:com.android.tools.r8.graph.ProgramMethod createSyntheticCloseResourceMethod(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):68:73 -> a
-    23:23:com.android.tools.r8.graph.ProgramMethod createSyntheticCloseResourceMethod(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):70:70 -> a
-    24:26:void lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.synthesis.SyntheticMethodBuilder):76:78 -> a
-    27:28:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):86:87 -> a
-    29:29:boolean isTwrCloseResourceMethod(com.android.tools.r8.graph.DexMethod):91:91 -> a
-    1:2:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80:81 -> b
+    1:16: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.graph.DexItemFactory):49:64 -> a
+    17:22:com.android.tools.r8.graph.ProgramMethod createSyntheticCloseResourceMethod(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):69:74 -> a
+    23:23:com.android.tools.r8.graph.ProgramMethod createSyntheticCloseResourceMethod(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):71:71 -> a
+    24:26:void lambda$createSyntheticCloseResourceMethod$1(com.android.tools.r8.synthesis.SyntheticMethodBuilder):77:79 -> a
+    27:28:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):87:88 -> a
+    29:29:boolean isTwrCloseResourceMethod(com.android.tools.r8.graph.DexMethod):92:92 -> a
+    1:2:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81:82 -> b
     3:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):493:528 -> b
-    3:38:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    3:38:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     39:51:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):525:537 -> b
-    39:51:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    39:51:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     52:52:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     52:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537 -> b
-    52:52:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    52:52:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     53:62:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:546 -> b
-    53:62:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    53:62:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     63:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):543:558 -> b
-    63:78:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    63:78:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     79:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):555:559 -> b
-    79:83:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    79:83:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     84:105:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):553:574 -> b
-    84:105:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    84:105:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     106:110:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):571:575 -> b
-    106:110:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    106:110:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     111:128:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):569:586 -> b
-    111:128:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    111:128:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     129:129:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     129:129:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):586 -> b
-    129:129:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    129:129:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     130:135:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):586:591 -> b
-    130:135:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    130:135:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     136:136:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> b
-    136:136:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    136:136:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     137:151:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:603 -> b
-    137:151:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    137:151:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     152:163:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):600:611 -> b
-    152:163:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    152:163:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     164:175:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):608:619 -> b
-    164:175:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    164:175:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     176:189:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):615:628 -> b
-    176:189:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    176:189:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     190:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):624:635 -> b
-    190:201:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    190:201:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     202:216:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:646 -> b
-    202:216:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    202:216:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     217:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:655 -> b
-    217:232:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    217:232:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     233:233:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655 -> b
-    233:233:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    233:233:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     234:249:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:670 -> b
-    234:249:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    234:249:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     250:262:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):667:679 -> b
-    250:262:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    250:262:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     263:275:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):675:687 -> b
-    263:275:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    263:275:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     276:287:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):684:695 -> b
-    276:287:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    276:287:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     288:299:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):691:702 -> b
-    288:299:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    288:299:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     300:314:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):699:713 -> b
-    300:314:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    300:314:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     315:330:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:722 -> b
-    315:330:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    315:330:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     331:331:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     331:331:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):722 -> b
-    331:331:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    331:331:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     332:337:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):722:727 -> b
-    332:337:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    332:337:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     338:338:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:726 -> b
-    338:338:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    338:338:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     339:351:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:737 -> b
-    339:351:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    339:351:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     352:364:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:746 -> b
-    352:364:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    352:364:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     365:365:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     365:365:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746 -> b
-    365:365:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    365:365:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     366:376:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:756 -> b
-    366:376:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    366:376:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     377:377:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     377:377:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> b
-    377:377:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    377:377:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     378:395:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:773 -> b
-    378:395:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    378:395:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     396:396:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     396:396:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> b
-    396:396:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    396:396:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     397:408:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:784 -> b
-    397:408:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    397:408:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     409:409:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     409:409:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> b
-    409:409:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    409:409:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     410:421:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:795 -> b
-    410:421:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    410:421:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     422:422:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     422:422:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):795 -> b
-    422:422:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    422:422:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     423:425:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):795:797 -> b
-    423:425:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    423:425:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     426:716:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):515:805 -> b
-    426:716:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    426:716:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     717:729:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):804:816 -> b
-    717:729:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    717:729:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     730:737:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:822 -> b
-    730:737:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    730:737:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     738:745:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):821:828 -> b
-    738:745:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    738:745:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     746:753:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):827:834 -> b
-    746:753:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    746:753:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     754:762:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):833:841 -> b
-    754:762:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    754:762:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
     763:805:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:842 -> b
-    763:805:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):80 -> b
+    763:805:com.android.tools.r8.graph.Code lambda$createSyntheticCloseResourceMethod$0(com.android.tools.r8.graph.DexMethod):81 -> b
 com.android.tools.r8.ir.optimize.ArgumentRemovalUtils -> com.android.tools.r8.internal.p1:
     1:5:boolean isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
 com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.N1:
@@ -42222,7 +42467,7 @@
     38:61:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):135 -> a
     62:62:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):136:136 -> a
     63:64:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):123:124 -> a
-    65:70:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):450:455 -> a
+    65:70:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):454:459 -> a
     65:70:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):124 -> a
     71:89:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForType(com.android.tools.r8.graph.DexType):125:143 -> a
     90:91:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):305:306 -> a
@@ -42734,7 +42979,7 @@
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
     1:3:void <clinit>():57:59 -> <clinit>
     1:1:void <init>(java.lang.String,int):56:56 -> <init>
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.k6:
     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
@@ -42804,13 +43049,13 @@
     733:733:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):492:492 -> a
     734:734:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):519:519 -> a
     735:737:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):537:539 -> a
-    738:738:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1438:1438 -> a
+    738:738:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1453:1453 -> a
     738:738:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):539 -> a
     739:741:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):542:544 -> a
     742:742:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     742:742:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
     743:744:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544:545 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.j6$a:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.k6$a:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -42825,13 +43070,13 @@
     1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> b
     1:1:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86 -> b
     2:3:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):87:88 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.k6:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.l6:
     java.util.Map fieldsWithStaticValues -> a
     1:1:void <init>(java.util.Map):107:107 -> <init>
     2:5:void <init>(java.util.Map):105:108 -> <init>
     1:1:void join(java.util.Map):112:112 -> a
     2:2:void execute():118:118 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.K7:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.L7:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -42842,7 +43087,7 @@
     1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):243:243 -> a
     2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):429:452 -> a
     26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):519:519 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1739:1739 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1749:1749 -> a
     27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):519 -> a
     28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():665:666 -> a
     28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):519 -> a
@@ -43012,15 +43257,10 @@
     949:949:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2834:2834 -> a
     950:950:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     950:950:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2834 -> a
-    951:951:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2835:2835 -> a
-    952:952:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():205:205 -> a
-    952:952:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2836 -> a
-    953:953:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2837:2837 -> a
+    951:953:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2835:2837 -> a
     954:954:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     954:954:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2837 -> a
-    955:955:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2839:2839 -> a
-    956:956:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():205:205 -> a
-    956:956:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2840 -> a
+    955:956:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2839:2840 -> a
     957:957:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2860:2860 -> a
     957:957:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2841 -> a
     958:959:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2855:2856 -> a
@@ -43241,7 +43481,7 @@
     1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):958:958 -> k
     2:2:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):962:962 -> k
     2:2:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):958 -> k
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1525:1525 -> k
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1535:1535 -> k
     3:3:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):962 -> k
     3:3:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):958 -> k
     4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):965:965 -> k
@@ -43264,7 +43504,7 @@
     85:88:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):968 -> k
     85:88:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):958 -> k
     1:1:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):972:972 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveSwitchMaxIntBug():1928:1928 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveSwitchMaxIntBug():1938:1938 -> l
     2:2:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):972 -> l
     3:3:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):972:972 -> l
     4:29:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchForMaxIntOnly(com.android.tools.r8.ir.code.IRCode):980:1005 -> l
@@ -43297,7 +43537,7 @@
     56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> o
     56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1967 -> o
     57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1968:1982 -> o
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1700:1700 -> o
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1710:1710 -> o
     72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1983 -> o
     73:73:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> o
     73:73:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1983 -> o
@@ -43413,10 +43653,10 @@
     8:8:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> v
     8:8:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3921 -> v
     9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3922:3954 -> v
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.K7$a:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.L7$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():2683:2683 -> <clinit>
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.K7$b:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.L7$b:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():2404:2404 -> <clinit>
@@ -43428,7 +43668,7 @@
     2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2404 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2417:2417 -> a
     3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2404 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1672:1672 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1682:1682 -> a
     4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2417 -> a
     4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):2404 -> a
     5:20:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2421:2436 -> a
@@ -43438,7 +43678,7 @@
     22:36:int doHash(java.lang.Object):2404 -> a
     37:42:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2468:2473 -> a
     43:47:int getHashCode(com.android.tools.r8.ir.code.Value):2479:2483 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.K7$c:
+com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.L7$c:
     boolean anyAffectedValues -> a
     boolean anySimplifications -> b
     boolean $assertionsDisabled -> c
@@ -43447,7 +43687,7 @@
     2:5:void <init>(boolean,boolean):2566:2569 -> <init>
     1:1:boolean anyAffectedValues():2573:2573 -> a
     1:1:boolean anySimplifications():2577:2577 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.K7$d:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.L7$d:
     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
@@ -43467,17 +43707,17 @@
     17:20:com.android.tools.r8.ir.code.BasicBlock build():676 -> a
     21:23:com.android.tools.r8.ir.code.BasicBlock build():678:680 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):655:655 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.internal.K7$e:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.internal.L7$e:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult UNKNOWN -> a
     1:3:void <clinit>():149:151 -> <clinit>
     1:1:void <init>(java.lang.String,int):148:148 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.K7$f:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.L7$f:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):555:556 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.K7$g:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.L7$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():761:761 -> <clinit>
@@ -43508,12 +43748,12 @@
     11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782:783 -> b
     13:13: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
     13:13:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):783 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.internal.K7$h:
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.internal.L7$h:
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult NO_REMOVALS -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult REMOVED_CAST_DO_NARROW -> b
     1:2:void <clinit>():1406:1407 -> <clinit>
     1:1:void <init>(java.lang.String,int):1405:1405 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.K7$i:
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.L7$i:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
@@ -43528,7 +43768,7 @@
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):620:621 -> a
     32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):610:610 -> 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):616:616 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.J8:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.K8:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -43561,36 +43801,33 @@
     45:45:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142:142 -> a
     46:46:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     46:46:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):147 -> a
-    47:60:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:161 -> a
-    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():205:205 -> a
-    61:61:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
-    62:68:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164:170 -> a
-    69:70:boolean com.android.tools.r8.ir.optimize.ConstantCanonicalizer.constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):292:293 -> a
-    69:70:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
-    71:130:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:240 -> a
-    131:133:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):46:48 -> a
-    131:133:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240 -> a
-    134:134:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257:257 -> a
-    135:158:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):231:254 -> a
-    159:164:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):243:248 -> a
-    165:165:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247:247 -> a
-    166:168:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):48:50 -> a
-    166:168:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247 -> a
-    169:172:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225:228 -> a
-    173:175:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):46:48 -> a
-    173:175:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228 -> a
-    176:176:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):259:259 -> a
-    177:188:void com.android.tools.r8.ir.optimize.ConstantCanonicalizer.insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):277:288 -> a
-    177:188:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):260 -> a
-    189:192:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261:264 -> a
-    193:194:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):423:424 -> a
-    193:194:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):264 -> a
-    195:203:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):265:273 -> a
-    204:204:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):182:182 -> a
-    205:205:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
-    206:206:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):209:209 -> a
+    47:69:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:170 -> a
+    70:71:boolean com.android.tools.r8.ir.optimize.ConstantCanonicalizer.constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):292:293 -> a
+    70:71:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
+    72:131:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:240 -> a
+    132:134:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):46:48 -> a
+    132:134:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):240 -> a
+    135:135:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257:257 -> a
+    136:159:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):231:254 -> a
+    160:165:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):243:248 -> a
+    166:166:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247:247 -> a
+    167:169:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):48:50 -> a
+    167:169:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):247 -> a
+    170:173:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225:228 -> a
+    174:176:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):46:48 -> a
+    174:176:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228 -> a
+    177:177:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):259:259 -> a
+    178:189:void com.android.tools.r8.ir.optimize.ConstantCanonicalizer.insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):277:288 -> a
+    178:189:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):260 -> a
+    190:193:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261:264 -> a
+    194:195:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):423:424 -> a
+    194:195:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):264 -> a
+    196:204:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):265:273 -> a
+    205:205:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):182:182 -> a
+    206:206:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
+    207:207:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):209:209 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):208:208 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.J8:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -43606,7 +43843,7 @@
     29:29:int hashCode(java.lang.Object):95 -> a
     30:30:int com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.Instruction):102:102 -> a
     30:30:int hashCode(java.lang.Object):95 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.j9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -43642,7 +43879,7 @@
     15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):74 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):75:75 -> b
     17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):74:74 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.i9$a:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.j9$a:
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_DEAD_INSTANCE -> a
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_NOT_DEAD_INSTANCE -> b
     1:9:void <clinit>():227:235 -> <clinit>
@@ -43653,11 +43890,11 @@
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():248:248 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.g9:
     1:1:void <init>():228:228 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.h9:
     1:1:void <init>():236:236 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.i9:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value):252:252 -> <init>
     1:1:java.lang.Iterable getValuesRequiredToBeDead():265:265 -> b
@@ -43681,7 +43918,7 @@
     48:50:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):93:95 -> a
     48:50:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):263 -> a
     51:88:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):123:160 -> a
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     89:89:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128 -> a
     89:89:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):157 -> a
     89:89:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):160 -> a
@@ -43724,7 +43961,7 @@
     2:13:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):230:241 -> b
     2:13:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):218 -> b
     14:21:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):219:226 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.da:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.ea:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
@@ -43788,7 +44025,7 @@
     320:320:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     320:320:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):313 -> a
     321:323:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):313:315 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.Xa:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.Ya:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -43814,7 +44051,7 @@
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):78:90 -> a
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):71 -> a
     19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):139:142 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Ee:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Ze:
     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
@@ -43844,7 +44081,7 @@
     182:182: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):215:215 -> a
     183:186:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):219:222 -> a
     187:202:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):221:236 -> a
-    203:203:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):115:115 -> a
+    203:203:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):116:116 -> a
     203:203:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):231 -> a
     204:207:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):242:245 -> a
     208:218:void com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer.insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):314:324 -> a
@@ -43853,7 +44090,7 @@
     221:243:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
     244:244:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):304:304 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):214:214 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.De:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.Ye:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -44022,7 +44259,7 @@
     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):797:799 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.ng:
     com.android.tools.r8.graph.DexType receiverType -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):843:845 -> <init>
@@ -44097,7 +44334,7 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):195:195 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):284:284 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):292:292 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.qg:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod) -> a
@@ -44110,7 +44347,7 @@
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.vg:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.Qg:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
@@ -44156,104 +44393,120 @@
     1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):212:212 -> d
     2:2:java.lang.Boolean lambda$hasSeenStrictlyBelow$3(com.android.tools.r8.graph.DexClass,java.lang.Boolean):212:212 -> d
     1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):195:196 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.Dq:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.br:
     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>():49:51 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):57:61 -> <init>
-    1:12:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):82:93 -> a
-    1:12:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):154 -> a
+    1:3:void <clinit>():51:53 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView):59:63 -> <init>
+    1:12:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):84:95 -> a
+    1:12:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
     13:13:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    13:13:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):94 -> a
-    13:13:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):154 -> a
-    14:34:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):94:114 -> a
-    14:34:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):154 -> a
-    35:53:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):111:129 -> a
-    35:53:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):154 -> a
-    54:54:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):124:124 -> a
-    54:54:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):154 -> a
-    55:56:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):157:158 -> a
-    57:59:void com.android.tools.r8.ir.optimize.MemberValuePropagation.setValueRangeFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.Value):141:143 -> a
-    57:59:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):158 -> a
-    60:69:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):162:171 -> a
-    70:70:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    70:70:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):173 -> a
-    71:71:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):174:174 -> a
-    72:72:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    72:72:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):175 -> a
-    73:75:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):176:178 -> a
-    76:83:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):177:184 -> a
-    84:92:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):279:287 -> a
-    93:102:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):286:295 -> a
-    103:103:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    103:103:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):296 -> a
-    104:104:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    104:104:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):296 -> a
-    105:105:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
-    105:105:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):65 -> a
-    105:105:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):300 -> a
-    106:109:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):66:69 -> a
-    106:109:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):300 -> a
-    110:112:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):305:307 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    113:113:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):312 -> a
-    114:118:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):312:316 -> a
-    119:119:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    119:119:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):316 -> a
-    120:126:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):318:324 -> a
-    127:127:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    127:127:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):327 -> a
-    128:132:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):329:333 -> a
-    133:156:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):331:354 -> a
-    157:157:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    157:157:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):358 -> a
-    158:162:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):359:363 -> a
-    163:178:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):362:377 -> a
-    179:179:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):287:287 -> a
-    180:187:void run(com.android.tools.r8.ir.code.IRCode):422:429 -> a
-    188:188:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    188:188:void run(com.android.tools.r8.ir.code.IRCode):429 -> a
-    189:192:void run(com.android.tools.r8.ir.code.IRCode):429:432 -> a
-    193:204:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):440:451 -> a
-    205:224:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):197:216 -> a
-    205:224:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    225:225:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    225:225:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):73 -> a
-    225:225:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):221 -> a
-    225:225:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    226:229:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):74:77 -> a
-    226:229:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):221 -> a
-    226:229:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    230:231:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):226:227 -> a
-    230:231:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    232:232:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    232:232:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):227 -> a
-    232:232:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    233:255:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):230:252 -> a
-    233:255:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    256:272:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):251:267 -> a
-    256:272:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):450 -> a
-    273:275:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):452:454 -> a
-    276:279:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):453:456 -> a
-    280:280:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):384:384 -> a
-    280:280:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):456 -> a
-    281:281:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    281:281:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):385 -> a
-    281:281:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):456 -> a
-    282:286:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):392:396 -> a
-    282:286:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):456 -> a
-    287:288:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):457:458 -> a
-    289:289:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):401:401 -> a
-    289:289:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):458 -> a
-    290:290:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    290:290:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):402 -> a
-    290:290:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):458 -> a
-    291:295:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):409:413 -> a
-    291:295:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):458 -> a
+    13:13:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):96 -> a
+    13:13:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    14:34:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):96:116 -> a
+    14:34:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    35: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):113:124 -> a
+    35: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):167 -> a
+    47:50: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):123:126 -> a
+    47:50: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):167 -> a
+    51:51:com.android.tools.r8.ir.code.StaticGet$Builder com.android.tools.r8.ir.code.StaticGet.builder():42:42 -> a
+    51:51: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):126 -> a
+    51:51: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):167 -> a
+    52:52: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):127:127 -> a
+    52:52: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):167 -> a
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
+    53:53:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66 -> a
+    53:53:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128 -> a
+    53:53:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66:66 -> a
+    54:54:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128 -> a
+    54:54:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    55:69: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):128:142 -> a
+    55: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):167 -> a
+    70:70: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):137:137 -> a
+    70:70:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    71:72:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):170:171 -> a
+    73:75: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):154:156 -> a
+    73:75:boolean applyAssumeInfoIfPossible(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):171 -> a
+    76: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):175:184 -> a
+    86:86:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    86:86: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):186 -> a
+    87:87: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):187:187 -> a
+    88:88:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    88:88: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):188 -> a
+    89:91: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):189:191 -> a
+    92:113: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):190:211 -> a
+    114:122:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):305:313 -> a
+    123:132:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):312:321 -> a
+    133:133:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
+    133:133:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):322 -> a
+    134:134:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    134:134:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):322 -> a
+    135:135:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
+    135:135:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):67 -> a
+    135:135: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):326 -> a
+    136:139:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):68:71 -> a
+    136:139: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):326 -> a
+    140:142:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):331:333 -> a
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
+    143:143:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):338 -> a
+    144:148:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):338:342 -> a
+    149:149:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
+    149:149: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):342 -> a
+    150: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):344:350 -> a
+    157:157:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> 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):353 -> a
+    158:162:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):355:359 -> a
+    163:186:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):357:380 -> a
+    187:187:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    187:187: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
+    188: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):385:389 -> a
+    193:208: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:403 -> a
+    209:209:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):313:313 -> a
+    210:217:void run(com.android.tools.r8.ir.code.IRCode):448:455 -> a
+    218:218:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    218:218:void run(com.android.tools.r8.ir.code.IRCode):455 -> a
+    219:222:void run(com.android.tools.r8.ir.code.IRCode):455:458 -> a
+    223:234:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):466:477 -> a
+    235:254: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):223:242 -> a
+    235:254:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    255:255:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
+    255:255:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):75 -> a
+    255:255:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
+    255:255:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    256:259:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):76:79 -> a
+    256:259:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
+    256:259:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    260:261: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):252:253 -> a
+    260:261:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    262:262:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
+    262:262: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):253 -> a
+    262:262:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    263:285: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):256:278 -> a
+    263:285:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    286:302: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):277:293 -> a
+    286:302:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    303:305:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):478:480 -> a
+    306:309:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):479:482 -> a
+    310:310: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):410:410 -> a
+    310:310:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
+    311:311:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
+    311:311: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):411 -> a
+    311:311:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
+    312:316: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):418:422 -> a
+    312:316:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
+    317:318:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):483:484 -> a
+    319:319: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):427:427 -> a
+    319:319:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
+    320:320:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
+    320:320: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):428 -> a
+    320:320:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
+    321:325: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):435:439 -> a
+    321:325:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
 com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.h:
     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
@@ -44303,7 +44556,6 @@
     29:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):87:87 -> b
     29:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
     30:30:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):83:83 -> b
-    30:30:boolean com.android.tools.r8.ir.optimize.MemberPoolCollection.hasPool(com.android.tools.r8.graph.DexClass):0 -> b
     30:30:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):87 -> b
     30:30:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
     31:32:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):87:88 -> b
@@ -44325,7 +44577,7 @@
     27:27:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155:155 -> d
     28:28:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):273:273 -> d
     28:28: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.Cr:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.Vr:
     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>
@@ -44337,8 +44589,8 @@
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
     1:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):40:41 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1472:1472 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():502 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1483:1483 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():505 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41 -> a
     4:9:void removeNests():50:55 -> a
     4:9:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):42 -> a
@@ -44346,14 +44598,14 @@
     13:25:void reduceNests(java.util.concurrent.ExecutorService):62:74 -> a
     26:31:boolean lambda$processNestHost$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.NestMemberClassAttribute):84:89 -> a
     32:32:boolean lambda$processNestHost$0(com.android.tools.r8.graph.DexProgramClass):90:90 -> a
-    33:33:boolean com.android.tools.r8.utils.IterableUtils.hasNext(java.lang.Iterable):70:70 -> a
+    33:33:boolean com.android.tools.r8.utils.IterableUtils.hasNext(java.lang.Iterable):74:74 -> a
     33:33:boolean lambda$processNestHost$0(com.android.tools.r8.graph.DexProgramClass):90 -> a
     1:2:void processNestHost(com.android.tools.r8.graph.DexProgramClass):78:79 -> b
-    3:3:boolean com.android.tools.r8.utils.IterableUtils.hasNext(java.lang.Iterable):70:70 -> b
+    3:3:boolean com.android.tools.r8.utils.IterableUtils.hasNext(java.lang.Iterable):74:74 -> b
     3:3:void processNestHost(com.android.tools.r8.graph.DexProgramClass):79 -> b
     4:19:void processNestHost(com.android.tools.r8.graph.DexProgramClass):79:94 -> b
     1:4:void processNestMember(com.android.tools.r8.graph.DexProgramClass):99:102 -> c
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.us:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.Ns:
     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
@@ -44376,7 +44628,7 @@
     43:53:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
     54:54:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
     54:54:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):78 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Vu:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.pv:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> b
     java.util.Map generatedOutlines -> c
@@ -44435,7 +44687,7 @@
     2:3:java.util.function.Consumer getOutlineMethodIdentifierGenerator():1303:1304 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):105:105 -> e
     2:27:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1317:1342 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.Ru:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.lv:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):207:208 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):212:212 -> a
@@ -44489,7 +44741,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():179:179 -> hashCode
     1:1:int hashCode():219 -> hashCode
     2:2:int hashCode():219:219 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.Su:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.mv:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -44516,7 +44768,7 @@
     51:51:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
     51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):498 -> a
     52:55:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):498:501 -> a
-    56:56:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):115:115 -> a
+    56:56:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):116:116 -> a
     56:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):501 -> a
     57:57:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):502:502 -> a
     1:1:java.lang.String getInstructionName():461:461 -> b
@@ -44526,7 +44778,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():179:179 -> hashCode
     1:1:int hashCode():407 -> hashCode
     2:6:int hashCode():407:411 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.Tu:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.nv:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):309:310 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):330:330 -> a
@@ -44545,7 +44797,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():179:179 -> hashCode
     1:1:int hashCode():325 -> hashCode
     2:2:int hashCode():325:325 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.Uu:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.ov:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -44569,7 +44821,7 @@
     1:18:boolean equals(java.lang.Object):579:596 -> equals
     1:6:int hashCode():604:609 -> hashCode
     1:37:java.lang.String toString():665:701 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.Vu$a:
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.pv$a:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1586:1587 -> <init>
@@ -44583,7 +44835,7 @@
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1634:1634 -> a
     1:1:boolean computeEquals(java.lang.Object):1644:1644 -> g
     1:1:java.lang.String toString():1624:1624 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Xu:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.rv:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():120:120 -> <clinit>
@@ -44595,7 +44847,7 @@
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.qv:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType[] $VALUES -> h
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType ADD -> a
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType SUB -> b
@@ -44607,13 +44859,13 @@
     1:7:void <clinit>():126:132 -> <clinit>
     8:8:void <clinit>():125:125 -> <clinit>
     1:1:void <init>(java.lang.String,int):125:125 -> <init>
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.Yu:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.sv:
     java.util.Map candidateMap -> q
     com.android.tools.r8.ir.optimize.Outliner this$0 -> r
     1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1144:1146 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1151:1153 -> a
     4:5:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1157:1158 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.Zu:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.tv:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
@@ -44632,12 +44884,12 @@
     69:69:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1268:1268 -> a
     70:74:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1265:1269 -> a
     75:75:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1267:1267 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.av:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.uv:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> q
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):1165:1166 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1171:1173 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1172:1172 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.bv:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.vv:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position position -> b
@@ -44670,7 +44922,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1562:1562 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.cv:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.wv:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     int returnValueUsersLeft -> m
@@ -44783,7 +45035,7 @@
     188:188:void process():753 -> c
     189:199:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):802:812 -> c
     189:199:void process():753 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.tv:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.Nv:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):40:40 -> a
@@ -44857,7 +45109,7 @@
     1:19:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):207:225 -> b
     20:20:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):224:224 -> b
     21:21:java.util.List lambda$shareIdenticalBlockSuffix$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):271:271 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.vv:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.Pv:
     1:1:void <init>():21:21 -> <init>
     1:1:boolean optimize(com.android.tools.r8.ir.code.IRCode):24:24 -> a
     1:6:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):112:117 -> b
@@ -44884,7 +45136,7 @@
     38:49:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     50:63:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> b
     50:63:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Zy:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Az:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState activeState -> g
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates activeStates -> f
@@ -44954,16 +45206,16 @@
     83:83:void run():240:240 -> b
     84:94:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):399:409 -> b
     84:94:void run():240 -> b
-    95:95:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> b
+    95:95:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146:146 -> b
     95:95:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):409 -> b
     95:95:void run():240 -> b
-    96:96:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:147 -> b
-    96:96:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> b
+    96:96: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):152:152 -> b
+    96:96:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146 -> b
     96:96:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):409 -> b
     96:96:void run():240 -> b
     97:107:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):410:420 -> b
     97:107:void run():240 -> b
-    108:108:boolean com.android.tools.r8.graph.AppView.hasLiveness():569:569 -> b
+    108:108:boolean com.android.tools.r8.graph.AppView.hasLiveness():579:579 -> b
     108:108:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):420 -> b
     108:108:void run():240 -> b
     109:111:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):422:424 -> b
@@ -45027,8 +45279,8 @@
     225:227:void run():324:326 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):56:56 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):56:56 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Sy:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Ty:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.tz:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.uz:
     java.util.LinkedHashMap finalInstanceFieldValues -> a
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> d
     java.util.LinkedHashMap nonFinalStaticFieldValues -> e
@@ -45091,7 +45343,7 @@
     3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.size(java.util.Set):869:869 -> e
     3:3:int size():863 -> e
     4:6:int size():863:865 -> e
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.vz:
     java.util.LinkedHashMap activeStateAtExit -> a
     int capacity -> b
     boolean $assertionsDisabled -> c
@@ -45114,14 +45366,14 @@
     76:76:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
     76:76:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):505 -> a
     77:77:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):506:506 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.Vy:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.wz:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):93:93 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value):97:98 -> <init>
     1:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):103:106 -> a
     1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Wy:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.xz:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -45131,9 +45383,9 @@
     1:1:com.android.tools.r8.graph.DexField access$800(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):132:132 -> a
     1:5:boolean equals(java.lang.Object):149:153 -> equals
     1:1:int hashCode():144:144 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Xy:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.yz:
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.Yy:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.zz:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
     boolean $assertionsDisabled -> c
@@ -45142,56 +45394,55 @@
     2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue):119:121 -> <init>
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):126:128 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):127:127 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.rA:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:24:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):40:63 -> a
-    25:42:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):193:210 -> a
-    25:42:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    43:43:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    43:43:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):210 -> a
-    43:43:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    44:44:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):211:211 -> a
-    44:44:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    45:45:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    45:45:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):211 -> a
-    45:45:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    46:48:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):212:214 -> a
-    46:48:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    49:49:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    49:49:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):214 -> a
-    49:49:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    50:86: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):215:251 -> a
-    50:86:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    87:97:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):250:260 -> a
-    87:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    98:98: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):259:259 -> a
-    98:98:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
-    99:99: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):162 -> a
-    99:99:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):259 -> a
-    99:99:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    100:100: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):162:162 -> a
-    100:100: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):259 -> a
-    100:100:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    101:105: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):258:262 -> a
-    101:105:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    106:107:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:70 -> a
-    108:152:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForGetClassTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual,java.util.function.BiConsumer):141:185 -> a
-    108:152:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66 -> a
-    153:154:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):76:77 -> a
-    155:155:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    155:155:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):77 -> a
-    156:158:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):77:79 -> a
-    159:159:boolean lambda$rewriteGetClassOrForNameToConstClass$0(com.android.tools.r8.ir.code.Instruction):53:53 -> a
-    160:160:java.util.function.BiConsumer rewriteSingleGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):88:88 -> a
-    161:168: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.graph.DexType,com.android.tools.r8.graph.DexClass):89:96 -> a
-    169:188: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.graph.DexType,com.android.tools.r8.graph.DexClass):95:114 -> a
-    189:207: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.graph.DexType,com.android.tools.r8.graph.DexClass):109:127 -> a
-    208:213: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.graph.DexType,com.android.tools.r8.graph.DexClass):126:131 -> a
-    214:214: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.graph.DexType,com.android.tools.r8.graph.DexClass):130:130 -> a
-    215:215: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.graph.DexType,com.android.tools.r8.graph.DexClass):120:120 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.xB:
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:21:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:61 -> a
+    22:39:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):210:227 -> a
+    22:39:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    40:40:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    40:40: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):227 -> a
+    40:40:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    41:41: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):228:228 -> a
+    41:41:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    42:42:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    42:42:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):228 -> a
+    42:42:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    43:45:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):229:231 -> a
+    43:45:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    46:46:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    46:46: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):231 -> a
+    46:46:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    47:83: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):232:268 -> a
+    47:83:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    84:94: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):267:277 -> a
+    84:94:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    95:95:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):276:276 -> a
+    95:95:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
+    96:96: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):162 -> a
+    96:96: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
+    96:96:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    97:97: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):162:162 -> a
+    97:97:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):276 -> a
+    97:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    98:102: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):275:279 -> a
+    98:102:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
+    103:104:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67:68 -> a
+    105:149:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForGetClassTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual,java.util.function.BiConsumer):158:202 -> a
+    105:149:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
+    150:151:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:75 -> a
+    152:152:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    152:152:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75 -> a
+    153:155:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:77 -> a
+    156:156:boolean lambda$rewriteGetClassOrForNameToConstClass$0(com.android.tools.r8.ir.code.Instruction):51:51 -> a
+    157:157:java.util.function.BiConsumer rewriteSingleGetClassOrForNameToConstClass(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.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):87:87 -> a
+    158:165: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):89:96 -> a
+    166:203: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):95:132 -> a
+    204: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):131: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.ServiceLoaderRewriter -> com.android.tools.r8.internal.XB:
     java.util.List serviceLoadMethods -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):65:65 -> <init>
@@ -45227,7 +45478,7 @@
     221:221:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):203 -> a
     222:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):90:118 -> a
     222:250:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):203 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.WB:
     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
@@ -45237,7 +45488,7 @@
     2:5:void com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter.clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):267:270 -> a
     2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):250 -> a
     6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):251:263 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.rE:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.TE:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
@@ -45314,7 +45565,7 @@
     97:98:boolean optimize():105 -> f
     99:99:void com.android.tools.r8.ir.optimize.SwitchCaseEliminator.replaceSwitchByGoto():153:153 -> f
     99:99:boolean optimize():105 -> f
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.sE:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.UE:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -45337,7 +45588,7 @@
     76:76:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122 -> a
     77:77:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
     78:80:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.TF:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.tG:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> b
     boolean $assertionsDisabled -> c
@@ -45371,12 +45622,12 @@
     246:246:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):294:294 -> a
     247:251:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):322:326 -> a
     1:16:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):302:317 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.SF:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.sG:
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy ALLOW_ARGUMENT_REMOVAL -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy DISALLOW_ARGUMENT_REMOVAL -> b
     1:2:void <clinit>():46:47 -> <clinit>
     1:1:void <init>(java.lang.String,int):45:45 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.TF$a:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.tG$a:
     boolean $assertionsDisabled -> o
     java.util.Map removedArgumentsInfoPerMethod -> n
     1:1:void <clinit>():50:50 -> <clinit>
@@ -45456,7 +45707,7 @@
     27:27:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):145 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):148:148 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):147:147 -> a
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.oG:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.KG:
     1:21:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):44:64 -> a
     1:21:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):82 -> a
     1:21:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):74 -> a
@@ -45518,10 +45769,10 @@
     58:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):159:182 -> d
     58:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):54 -> d
     58:81:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):46 -> d
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.nG:
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.oG$a:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.JG:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.KG$a:
     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.oG$b:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.KG$b:
     com.android.tools.r8.graph.ProgramMethod method -> a
     boolean optimized -> b
     boolean $assertionsDisabled -> c
@@ -45530,7 +45781,7 @@
     2:3:void <init>(com.android.tools.r8.graph.ProgramMethod):171:172 -> <init>
     1:2:com.android.tools.r8.graph.ProgramMethod getMethod():176:177 -> a
     3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):181:182 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.r6:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.s6:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():40:40 -> <clinit>
@@ -45558,12 +45809,12 @@
     159:159:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
     160:161: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
     160:161: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.q6:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.r6:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> a
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NOT_ELIGIBLE -> b
     1:2:void <clinit>():43:44 -> <clinit>
     1:1:void <init>(java.lang.String,int):42:42 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.s6:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.t6:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> b
     boolean $assertionsDisabled -> e
@@ -45587,7 +45838,7 @@
     44:44:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):78 -> a
     45:55:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):79:89 -> a
     56:57:boolean exceedsInstructionBudgetAfterIncrement(int):95:96 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.w6:
     java.util.Map deferredAliasValidityChecks -> c
     java.util.Set receiverAliases -> a
     java.util.Set illegalReceiverAliases -> b
@@ -45611,7 +45862,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.Lc:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Mc:
     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
@@ -45631,7 +45882,7 @@
     80:83:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
     1:3:com.android.tools.r8.ir.code.Value getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:65 -> b
     4:16:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.mg:
     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
@@ -45868,10 +46119,10 @@
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> f
     21:21:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():164 -> f
     22:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():164:175 -> f
-    34:34:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> f
+    34:34:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146:146 -> f
     34:34:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():175 -> f
-    35:35:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:147 -> f
-    35:35:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> f
+    35:35: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):152:152 -> f
+    35:35:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146 -> f
     35:35:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():175 -> f
     36:53:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():176:193 -> f
     54:54:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():25:25 -> f
@@ -45891,7 +46142,7 @@
     50:50:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> g
     50:50:void rebindIndirectEligibleInstanceUsersFromPhis():568 -> g
     51:57:void rebindIndirectEligibleInstanceUsersFromPhis():568:574 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Qf:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.lg:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1222:1222 -> <clinit>
     1:2:void <init>():1224:1225 -> <init>
@@ -45945,7 +46196,7 @@
     1:1:boolean equals(java.lang.Object):43:43 -> equals
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages getInstance():16:16 -> g
     1:1:int hashCode():48:48 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.v6:
     1:2: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):20:21 -> a
     3:3:int com.android.tools.r8.graph.DexEncodedMethod.getNumberOfArguments():211:211 -> a
     3:3: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):21 -> a
@@ -45965,12 +46216,12 @@
     18:18: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):38 -> a
     19:21: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):39:41 -> a
     22:22: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) -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.s9:
+com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.t9:
     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.wi:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.Ri:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -46004,7 +46255,7 @@
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():24 -> i
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.setParameterUsedAsLock():159:162 -> j
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():24 -> j
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.vi:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.Qi:
     boolean isParameterUsedAsLock -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder methodCallsWithParameterAsReceiverBuilder -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder fieldsReadFromParameterBuilder -> a
@@ -46023,7 +46274,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder joinIsReceiverUsedAsLock(boolean):254:254 -> c
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterReturned():264:264 -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterUsedAsLock():269:269 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.nt:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -46047,7 +46298,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multiset getMethodCallsWithParameterAsReceiver():72:72 -> m
     1:1:boolean isParameterMutated():77:77 -> n
     1:1:boolean isParameterUsedAsLock():87:87 -> o
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.Us:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.ot:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -46126,7 +46377,7 @@
     4:4:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext createInitial():28:28 -> c
     1:6:boolean equals(java.lang.Object):119:124 -> equals
     1:1:int hashCode():129:129 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.Vs:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.pt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap backing -> a
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration aliasedValueConfiguration -> b
     boolean $assertionsDisabled -> c
@@ -46202,7 +46453,7 @@
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():113 -> e
     1:5:boolean equals(java.lang.Object):227:231 -> equals
     1:1:int hashCode():236:236 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.mv:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.Gv:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver) -> a
@@ -46217,13 +46468,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():88:88 -> k
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.nv:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.Hv:
     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.ov:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.Iv:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int) -> a
@@ -46248,7 +46499,7 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages asNonEmpty() -> d
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.UE:
+com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.wF:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Set instructionsOfInterest -> g
     com.android.tools.r8.graph.AppView appView -> a
@@ -46379,7 +46630,7 @@
     232:232:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):363 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeMonitor$5(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):333:333 -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeReturn$6(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):338:338 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.XF:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.xG:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage TOP -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -46391,7 +46642,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():17:17 -> l
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.YF:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.yG:
     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>
@@ -46400,7 +46651,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.ZF:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.zG:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -46429,14 +46680,14 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):31:31 -> a
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint getInstance():21:21 -> d
-com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.t6:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.u6:
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int) -> a
     boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.ProgramMethod,int) -> a
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysFalseClassInlinerMethodConstraint alwaysFalse():28:28 -> a
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint alwaysTrue():32:32 -> c
-com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.z8:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.A8:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages usages -> a
     1:1:void <clinit>():25:25 -> <clinit>
@@ -46449,7 +46700,7 @@
     2:2:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> b
     2:2:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter():36 -> b
     3:12:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter():39:48 -> b
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.qE:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.SE:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():15:17 -> <clinit>
@@ -46458,7 +46709,7 @@
     2:15:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):26:39 -> a
     16:32:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):44:60 -> a
     33:44: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.EnumDataMap -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.wb:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -46482,7 +46733,7 @@
     2:3:boolean matchesValuesField(com.android.tools.r8.graph.DexField):59:60 -> c
     4:4:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):101:101 -> c
     4:4:boolean matchesValuesField(com.android.tools.r8.graph.DexField):60 -> c
-com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.vb$a:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.wb$a:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap unboxedValues -> b
     int valuesSize -> d
@@ -46490,425 +46741,507 @@
     com.android.tools.r8.com.google.common.collect.ImmutableSet valuesFields -> c
     1:1:void <clinit>():63:63 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet,int):79:83 -> <init>
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.xb:
     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.wb$a:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.xb$a:
     1:1:void <init>():52:52 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.yb:
     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.yb:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.zb:
     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.zb:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.Ab:
     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.Eb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.Fb:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumUnboxingCandidatesInfo -> c
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.ProgramPackageCollection enumsToUnboxWithPackageRequirement -> d
-    java.util.Map debugLogs -> i
-    boolean debugLogEnabled -> h
+    boolean $assertionsDisabled -> h
     java.util.Map staticFieldValuesMap -> e
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter enumUnboxerRewriter -> g
     com.android.tools.r8.graph.DexEncodedField ordinalField -> f
-    1:1:void <clinit>():107:107 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):126:126 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView):115:144 -> <init>
+    1:1:void <clinit>():123:123 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):142:142 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.AppView):131:160 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues.isEnumStaticFieldValues():0:0 -> a
-    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):683 -> a
-    2:4:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):686:688 -> a
-    5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):173:173 -> a
-    5:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):688 -> a
-    6:6:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):689:689 -> a
-    7:7:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):107:107 -> a
-    8:10:void markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):153:155 -> a
-    11:12:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):159:160 -> a
-    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):173:173 -> a
-    13:13:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):161 -> a
-    14:17:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):163:166 -> a
-    18:37:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):177:196 -> a
-    38:38:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):173:173 -> a
-    38:38:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):196 -> a
-    39:51:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):198:210 -> a
-    52:53:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):255:256 -> a
-    52:53:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):210 -> a
-    54:54:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):173:173 -> a
-    54:54:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    54:54:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):210 -> a
-    55:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):258:262 -> a
-    55:59:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):210 -> a
-    60:60:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):216:216 -> a
-    61:62:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):242:243 -> a
-    61:62:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):216 -> a
-    63:63:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):173:173 -> a
-    63:63:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):243 -> a
-    63:63:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):216 -> a
-    64:65:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):245:246 -> a
-    64:65:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):216 -> a
+    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):764 -> a
+    2:4:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):767:769 -> a
+    5:5:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):199:199 -> a
+    5:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):769 -> a
+    6:6:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):770:770 -> a
+    boolean reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.eligibility.Reason) -> a
+    7:7:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):123:123 -> a
+    8:8:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):175:175 -> a
+    9:9:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    9:9:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):176 -> a
+    10:10:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):178:178 -> a
+    11:12:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):185:186 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):199:199 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):187 -> a
+    14:17:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):189:192 -> a
+    18:37:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):203:222 -> a
+    38:38:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):199:199 -> a
+    38:38:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):222 -> a
+    39:51:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):224:236 -> a
+    52:53:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):281:282 -> a
+    52:53:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):236 -> a
+    54:54:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):199:199 -> a
+    54:54:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):282 -> a
+    54:54:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):236 -> a
+    55:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):284:288 -> a
+    55:59:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):236 -> a
+    60:60:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    61:62:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):268:269 -> a
+    61:62:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):242 -> a
+    63:63:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):199:199 -> a
+    63:63:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):269 -> a
+    63:63:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):242 -> a
+    64:65:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):271:272 -> a
+    64:65:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):242 -> a
     66:66:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):248:248 -> a
-    66:66:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):246 -> a
-    66:66:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):216 -> a
-    67:67:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):867:867 -> a
-    67:67:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):248 -> a
-    67:67:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):246 -> a
-    67:67:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):216 -> a
-    68:69:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):247:248 -> a
-    68:69:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):216 -> a
-    70:70:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):204:204 -> a
-    71:86:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):298:313 -> a
-    71:86:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):204 -> a
-    87:87:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):337:337 -> a
-    87:87:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):313 -> a
-    87:87:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):204 -> a
-    88:100:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):316:328 -> a
-    88:100:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):204 -> a
-    101:101:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):207:207 -> a
-    102:102:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):273:273 -> a
-    102:102:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):207 -> a
-    103:103:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):173:173 -> a
-    103:103:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):273 -> a
-    103:103:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):207 -> a
-    104:106:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):285:287 -> a
-    104:106:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):277 -> a
-    104:106:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):207 -> a
-    107:107:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):286:286 -> a
-    107:107:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):277 -> a
-    107:107:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):207 -> a
-    108:111:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):278:281 -> a
-    108:111:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):207 -> a
-    112:127:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):221:236 -> a
-    128:128:void addRequiredNameData(com.android.tools.r8.graph.DexType):332:332 -> a
-    129:139:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):343:353 -> a
-    140:140:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):173:173 -> a
-    140:140:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):353 -> a
-    141:152:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):355:366 -> a
-    153:153:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):373:373 -> a
-    154:186:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):921:953 -> a
-    154:186:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    187:187:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):933:933 -> a
-    187:187:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    188:190:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):285:287 -> a
-    188:190:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1020 -> a
-    188:190:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):933 -> a
-    188:190:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    191:191:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):286:286 -> a
-    191:191:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1020 -> a
-    191:191:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):933 -> a
-    191:191:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    192:194:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1021:1023 -> a
-    192:194:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):933 -> a
-    192:194:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    195:195:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):924:924 -> a
-    195:195:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    196:196:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAssumeUser(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):963:963 -> a
-    196:196:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):924 -> a
-    196:196:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    197:197:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):931:931 -> a
-    197:197:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    198:213:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeArrayPutUser(com.android.tools.r8.ir.code.ArrayPut,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):996:1011 -> a
-    198:213:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):931 -> a
-    198:213:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    214:214:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):929:929 -> a
-    214:214:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    215:215:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):928:928 -> a
-    215:215:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    216:237:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):926:947 -> a
-    216:237:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    238:262:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1093:1117 -> a
-    238:262:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    238:262:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    263:263:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():67:67 -> a
-    263:263:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1117 -> a
-    263:263:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    263:263:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    264:277:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1117:1130 -> a
-    264:277:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    264:277:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    278:278:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    278:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1132 -> a
-    278:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    278:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    279:281:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1133:1135 -> a
-    279:281:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    279:281:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    282:282:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    282:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1135 -> a
-    282:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    282:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    283:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1135:1157 -> a
-    283:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    283:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    306:331:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1155:1180 -> a
-    306:331:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    306:331:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    332:334:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1166:1168 -> a
-    332:334:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):947 -> a
-    332:334:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    335:335:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):951:951 -> a
-    335:335:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    336:336:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):949:949 -> a
-    336:336:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    337:337:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getReturnType():60:60 -> a
-    337:337:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1190 -> a
-    337:337:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):949 -> a
-    337:337:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    338:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1191:1194 -> a
-    338:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):949 -> a
-    338:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    342:342:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):941:941 -> a
-    342:342:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    343:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):940:940 -> a
-    343:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    344:344:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):938:938 -> a
-    344:344:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    345:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInstanceGetUser(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1080:1083 -> a
-    345:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):937 -> a
-    345:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):935:935 -> a
-    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    350:364:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1057:1071 -> a
-    350:364:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):935 -> a
-    350:364:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):374 -> a
-    365:379:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):375:389 -> a
-    380:381:void updateKeepInfo(java.util.Set):474:475 -> a
-    382:382:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):444:444 -> a
-    382:382:void updateKeepInfo(java.util.Set):475 -> a
-    383:383:void lambda$updateKeepInfo$0(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):475:475 -> a
-    384:388:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():479:483 -> a
-    384:388:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):397 -> a
-    389:397:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1198:1206 -> a
-    389:397:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():484 -> a
-    389:397:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):397 -> a
-    398:413:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1201:1216 -> a
-    398:413:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():484 -> a
-    398:413:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):397 -> a
-    414:424:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401:411 -> a
-    425:425:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier.builder():65:65 -> a
-    425:425:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):413 -> a
-    426:426:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):414:414 -> a
-    427:427:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator.builder(com.android.tools.r8.graph.AppView):64:64 -> a
-    427:427:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):415 -> a
-    428:443:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):415:430 -> a
-    444:444:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):641:641 -> a
-    444:444:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):430 -> a
-    445:445:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):439:439 -> a
-    445:445:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):431 -> a
-    446:447:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):432:433 -> a
-    448:493:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):507:552 -> a
-    448:493:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    494:494:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
-    494:494:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):552 -> a
-    494:494:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    495:497:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):552:554 -> a
-    495:497:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    498:527:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):553:582 -> a
-    498:527:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    528:531:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):609:612 -> a
-    528:531:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):584 -> a
-    528:531:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    532:532:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
-    532:532:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):614 -> a
-    532:532:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):584 -> a
-    532:532:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    533:536:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):615:618 -> a
-    533:536:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):584 -> a
-    533:536:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    537:537:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    537:537:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):618 -> a
-    537:537:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):584 -> a
-    537:537:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    538:553:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):618:633 -> a
-    538:553:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):584 -> a
-    538:553:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    554:564:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):585:595 -> a
-    554:564:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):493 -> a
-    565:568:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):495:498 -> a
-    569:570:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):637:638 -> a
-    571:571:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    571:571:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):638 -> a
-    572:574:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):639:641 -> a
-    575:575:void analyzeAccessibility():647:647 -> a
-    576:582:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):659:665 -> a
-    576:582:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):649 -> a
-    583:583:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.constraintForEnumUnboxing(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry):679:679 -> a
-    583:583:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):667 -> a
-    583:583:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):649 -> a
-    584:585:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):668:669 -> a
-    584:585:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):649 -> a
-    586:589:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):650:653 -> a
-    590:595:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1034:1039 -> a
-    596:596:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
-    596:596:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1039 -> a
-    597:597:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    597:597:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52 -> a
-    597:597:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1039 -> a
-    598:607:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1041:1050 -> a
-    608:609:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1220:1221 -> a
-    610:611:void synthesizeUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):1236:1237 -> a
-    1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):107:107 -> b
-    2:13:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():490:501 -> b
-    14:36:void lambda$analyzeInitializers$3(com.android.tools.r8.graph.DexProgramClass):892:914 -> b
-    37:40:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):1228:1231 -> b
-    1:1:void analyzeInitializers():889:889 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.Cb:
+    66:66:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):272 -> a
+    66:66:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):242 -> a
+    67:68:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):273:274 -> a
+    67:68:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):242 -> a
+    69:69:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):230:230 -> a
+    70:85:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):340:355 -> a
+    70:85:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):230 -> a
+    86:86:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):385:385 -> a
+    86:86:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):355 -> a
+    86:86:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):230 -> a
+    87:105:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):358:376 -> a
+    87:105:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):230 -> a
+    106:106:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):233:233 -> a
+    107:116:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):303:312 -> a
+    107:116:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):233 -> a
+    117:117:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):199:199 -> a
+    117:117:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):312 -> a
+    117:117:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):233 -> a
+    118:120:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):324:326 -> a
+    118:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):316 -> a
+    118:120:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):233 -> a
+    121:121:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):325:325 -> a
+    121:121:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):316 -> a
+    121:121:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):233 -> a
+    122:125:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):317:320 -> a
+    122:125:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):233 -> a
+    126:141:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):247:262 -> a
+    142:142:void addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):380:380 -> a
+    143:153:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):391:401 -> a
+    154:154:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):199:199 -> a
+    154:154:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):401 -> a
+    155:166:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):403:414 -> a
+    167:168:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):421:422 -> a
+    169:201:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):992:1024 -> a
+    169:201:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    202:202:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1004:1004 -> a
+    202:202:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    203:205:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):324:326 -> a
+    203:205:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1091 -> a
+    203:205:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1004 -> a
+    203:205:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    206:206:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):325:325 -> a
+    206:206:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1091 -> a
+    206:206:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1004 -> a
+    206:206:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    207:209:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1092:1094 -> a
+    207:209:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1004 -> a
+    207:209:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    210:210:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):995:995 -> a
+    210:210:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    211:211:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAssumeUser(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1034:1034 -> a
+    211:211:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):995 -> a
+    211:211:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    212:212:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1002:1002 -> a
+    212:212:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    213:228:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeArrayPutUser(com.android.tools.r8.ir.code.ArrayPut,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1067:1082 -> a
+    213:228:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1002 -> a
+    213:228:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    229:229:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1000:1000 -> a
+    229:229:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    230:230:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):999:999 -> a
+    230:230:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    231:252:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):997:1018 -> a
+    231:252:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    253:272:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1164:1183 -> a
+    253:272:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    253:272:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    273:273:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexClassAndMethod.getParameters():56:56 -> a
+    273:273:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1188 -> a
+    273:273:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    273:273:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    274:274:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():67:67 -> a
+    274:274:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexClassAndMethod.getParameters():56 -> a
+    274:274:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1188 -> a
+    274:274:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    274:274:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    275:275:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1188:1188 -> a
+    275:275:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    275:275:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    276:277:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getArgumentForParameter(int):165:166 -> a
+    276:277:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1189 -> a
+    276:277:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    276:277:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    278:278:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getParameter(int):52:52 -> a
+    278:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1190 -> a
+    278:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    278:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    279:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1190:1200 -> a
+    279:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    279:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    290:290:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1203 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    291:294:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1204:1207 -> a
+    291:294:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    291:294:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    295:295:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1207 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    296:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1207:1216 -> a
+    296:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    296:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    306:306:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):380:380 -> a
+    306:306:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1217 -> a
+    306:306:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    306:306:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    307:318:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1218:1229 -> a
+    307:318:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    307:318:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    319:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1227:1251 -> a
+    319:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    319:343:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    344:344:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1238:1238 -> a
+    344:344:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    344:344:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    345:345:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):380:380 -> a
+    345:345:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1239 -> a
+    345:345:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    345:345:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    346:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1240:1240 -> a
+    346:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1018 -> a
+    346:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1022:1022 -> a
+    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    348:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1020:1020 -> a
+    348:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    349:349:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getReturnType():64:64 -> a
+    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1261 -> a
+    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1020 -> a
+    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1262:1265 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1020 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    354:354:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1012:1012 -> a
+    354:354:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    355:355:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1011:1011 -> a
+    355:355:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    356:356:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1009:1009 -> a
+    356:356:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    357:360:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInstanceGetUser(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1151:1154 -> a
+    357:360:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1008 -> a
+    357:360:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    361:361:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1006:1006 -> a
+    361:361:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    362:376:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1128:1142 -> a
+    362:376:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1006 -> a
+    362:376:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    377:392:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):424:439 -> a
+    393:394:void updateKeepInfo(java.util.Set):517:518 -> a
+    395:395:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):444:444 -> a
+    395:395:void updateKeepInfo(java.util.Set):518 -> a
+    396:396:void lambda$updateKeepInfo$0(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):518:518 -> a
+    397:405:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():522:530 -> a
+    397:405:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):452 -> a
+    406:416:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):456:466 -> a
+    417:417:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier.builder():65:65 -> a
+    417:417:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):468 -> a
+    418:418:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):469:469 -> a
+    419:419:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator.builder(com.android.tools.r8.graph.AppView):64:64 -> a
+    419:419:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):470 -> a
+    420:435:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):470:485 -> a
+    436:436:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):651:651 -> a
+    436:436:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):485 -> a
+    437:437:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):494:494 -> a
+    437:437:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):486 -> a
+    438:438:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):74:74 -> a
+    438:438:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):494 -> a
+    438:438:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):486 -> a
+    439:439:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):32:32 -> a
+    439:439:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):75 -> a
+    439:439:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):494 -> a
+    439:439:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):486 -> a
+    440:441:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):487:488 -> a
+    442:459:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):553:570 -> a
+    442:459:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    460:460:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    460:460:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):570 -> a
+    460:460:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    461:472:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):576:587 -> a
+    461:472:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    473:473:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    473:473:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):586 -> a
+    473:473:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    474:479:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):590:595 -> a
+    474:479:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    480:480:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    480:480:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):592 -> a
+    480:480:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    481:496:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):598:613 -> a
+    481:496:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    497:497:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    497:497:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):612 -> a
+    497:497:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    498:498:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):616:616 -> a
+    498:498:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    499:499:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
+    499:499:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):616 -> a
+    499:499:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    500:502:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):616:618 -> a
+    500:502:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    503:522:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):617:636 -> a
+    503:522:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    523:524:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):661:662 -> a
+    523:524:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    523:524:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    525:528:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):682:685 -> a
+    525:528:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    525:528:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    525:528:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    529:529:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
+    529:529:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):687 -> a
+    529:529:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    529:529:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    529:529:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    530:535:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):688:693 -> a
+    530:535:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    530:535:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    530:535:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    536:536:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    536:536:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):692 -> a
+    536:536:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    536:536:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    536:536:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    537:537:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):694:694 -> a
+    537:537:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    537:537:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    537:537:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    538:538:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    538:538:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):696 -> a
+    538:538:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    538:538:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    538:538:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    539:542:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):696:699 -> a
+    539:542:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    539:542:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    539:542:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    543:543:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    543:543:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):697 -> a
+    543:543:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    543:543:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    543:543:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    544:558:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):700:714 -> a
+    544:558:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):664 -> a
+    544:558:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    544:558:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    559:569:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):665:675 -> a
+    559:569:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):645 -> a
+    559:569:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    570:574:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):650:654 -> a
+    570:574:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):538 -> a
+    575:579:void lambda$analyzeEnumInstances$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):541:545 -> a
+    580:581:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):718:719 -> a
+    582:582:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    582:582:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):719 -> a
+    583:585:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):720:722 -> a
+    586:586:void analyzeAccessibility():728:728 -> a
+    587:592:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1105:1110 -> a
+    593:593:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
+    593:593:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1110 -> a
+    594:594:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    594:594:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52 -> a
+    594:594:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1110 -> a
+    595:604:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1112:1121 -> a
+    605:606:void synthesizeUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):1379:1380 -> a
+    1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):123:123 -> b
+    2:16:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():535:549 -> b
+    17:23:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):740:746 -> b
+    17:23:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):730 -> b
+    24:24:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.constraintForEnumUnboxing(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry):760:760 -> b
+    24:24:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):748 -> b
+    24:24:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):730 -> b
+    25:26:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):749:750 -> b
+    25:26:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):730 -> b
+    27:30:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):731:734 -> b
+    31:34:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):1371:1374 -> b
+    1:1:void analyzeInitializers():970:970 -> c
+    2:15:void lambda$analyzeInitializers$3(com.android.tools.r8.graph.DexProgramClass):972:985 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.Db:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():442:442 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):442:442 -> <init>
-    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField):445:446 -> a
-    3:3:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
-    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField):446 -> a
-    4:8:void fixup(com.android.tools.r8.graph.DexEncodedField):448:452 -> a
-    9:9:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> a
-    9:9:void fixup(com.android.tools.r8.graph.DexEncodedField):452 -> a
-    10:10:void fixup(com.android.tools.r8.graph.DexEncodedField):452:452 -> a
-    11:20:void fixup(com.android.tools.r8.graph.DexEncodedMethod):458:467 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.Db:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):497:497 -> <init>
+    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):500:501 -> a
+    3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):41:41 -> a
+    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):501 -> a
+    4:5:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):501:502 -> a
+    6:7:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):508:509 -> a
+    8:8:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):152:152 -> a
+    8:8:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):509 -> a
+    9:11:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):509:511 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.Eb:
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> d
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.ProgramMethod context -> c
-    1:1:void <clinit>():693:693 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.DexItemFactory):698:699 -> <init>
-    1:4:com.android.tools.r8.ir.optimize.Inliner$Constraint computeConstraint(com.android.tools.r8.graph.ProgramMethod):703:706 -> a
-    5:30:com.android.tools.r8.ir.optimize.Inliner$Constraint deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):710:735 -> a
-    31:44:void registerTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMember):800:813 -> a
-    45:45:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):818:818 -> a
-    46:56:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):828:838 -> a
-    57:57:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):835:835 -> a
-    58:59:void registerCallSite(com.android.tools.r8.graph.DexCallSite):856:857 -> a
-    60:60:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):869:869 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):779:779 -> b
-    2:7:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):783:788 -> b
+    1:1:void <clinit>():774:774 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.DexItemFactory):779:780 -> <init>
+    1:4:com.android.tools.r8.ir.optimize.Inliner$Constraint computeConstraint(com.android.tools.r8.graph.ProgramMethod):784:787 -> a
+    5:30:com.android.tools.r8.ir.optimize.Inliner$Constraint deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):791:816 -> a
+    31:44:void registerTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMember):881:894 -> a
+    45:45:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):899:899 -> a
+    46:56:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):909:919 -> a
+    57:57:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):916:916 -> a
+    58:59:void registerCallSite(com.android.tools.r8.graph.DexCallSite):937:938 -> a
+    60:60:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):950:950 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):860:860 -> b
+    2:7:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):864:869 -> b
     8:9:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):603:604 -> b
-    8:9:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):788 -> b
-    10:15:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):789:794 -> b
-    16:16:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):793:793 -> b
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):759:759 -> c
-    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):823:823 -> c
-    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):874:874 -> c
-    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):764:764 -> d
-    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):847:847 -> d
-    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):769:769 -> e
-    2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):774:774 -> e
-    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):879:879 -> e
-    1:15:void registerTypeReference(com.android.tools.r8.graph.DexType):740:754 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):884:884 -> g
-    1:1:void registerFieldInstruction(com.android.tools.r8.graph.DexField):861:861 -> i
+    8:9:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):869 -> b
+    10:15:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):870:875 -> b
+    16:16:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):874:874 -> b
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):840:840 -> c
+    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):904:904 -> c
+    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):955:955 -> c
+    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):845:845 -> d
+    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):928:928 -> d
+    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):850:850 -> e
+    2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):855:855 -> e
+    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):960:960 -> e
+    1:15:void registerTypeReference(com.android.tools.r8.graph.DexType):821:835 -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):965:965 -> g
+    1:1:void registerFieldInstruction(com.android.tools.r8.graph.DexField):942:942 -> i
     2:2:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):248:248 -> i
-    2:2:void registerFieldInstruction(com.android.tools.r8.graph.DexField):861 -> i
-    3:4:void registerFieldInstruction(com.android.tools.r8.graph.DexField):863:864 -> i
-    5:5:void registerFieldInstruction(com.android.tools.r8.graph.DexField):862:862 -> i
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Fb:
+    2:2:void registerFieldInstruction(com.android.tools.r8.graph.DexField):942 -> i
+    3:4:void registerFieldInstruction(com.android.tools.r8.graph.DexField):944:945 -> i
+    5:5:void registerFieldInstruction(com.android.tools.r8.graph.DexField):943:943 -> i
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Gb:
     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
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> b
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):32:32 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):29:35 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():39:39 -> a
-    2:10:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):53:61 -> a
-    2:10:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    11:12:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):74:75 -> a
-    11:12:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    11:12:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    13:15:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):88:90 -> a
-    13:15:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):75 -> a
-    13:15:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    13:15:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    16:16:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):77:77 -> a
-    16:16:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    16:16:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    17:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.matchesValuesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):95:99 -> a
-    17:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):77 -> a
-    17:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    17:21:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    22:22:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):79:79 -> a
-    22:22:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):64 -> a
-    22:22:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    23:23:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):65:65 -> a
-    23:23:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    24:24:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):57:57 -> a
-    24:24:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40 -> a
-    25:25:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():41:41 -> a
-    26:26:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():103:103 -> a
-    26:26:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    27:27:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    27:27:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():104 -> a
-    27:27:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    28:28:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():105:105 -> a
-    28:28:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    29:31:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):114:116 -> a
-    29:31:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():106 -> a
-    29:31:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    32:37:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):115:120 -> a
-    32:37:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():106 -> a
-    32:37:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    38:42:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45:49 -> a
-    43:43:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):131:131 -> a
-    44:47:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):134:137 -> a
-    48:49:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):143:144 -> a
-    50:52:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):150:152 -> a
-    50:52:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):145 -> a
-    53:55:void removePinnedCandidate(com.android.tools.r8.graph.DexType):150:152 -> a
-    1:4:void removePinnedCandidates():129:132 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.Hb:
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):33:33 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):30:36 -> <init>
+    1:3:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():40:42 -> a
+    4:4:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():116:116 -> a
+    4:4:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
+    5:5:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    5:5:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():117 -> a
+    5:5:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
+    6:6:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():118:118 -> a
+    6:6:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
+    7:9:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):127:129 -> a
+    7:9:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():119 -> a
+    7:9:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
+    10:15:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):128:133 -> a
+    10:15:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():119 -> a
+    10:15:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
+    16:20:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():46:50 -> a
+    21:21:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):83:83 -> a
+    22:23:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):101:102 -> a
+    22:23:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):84 -> a
+    24:24:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():209:209 -> a
+    24:24:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):103 -> a
+    24:24:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):84 -> a
+    25:25:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):86:86 -> a
+    26:27:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.matchesValuesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):108:109 -> a
+    26:27:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):86 -> a
+    28:28:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():235:235 -> a
+    28:28:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.matchesValuesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    28:28:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):86 -> a
+    29:29:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():209:209 -> a
+    29:29:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.matchesValuesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    29:29:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):86 -> a
+    30:30:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.matchesValuesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):112:112 -> a
+    30:30:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):86 -> a
+    31:34:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):88:91 -> a
+    35:35:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):90:90 -> a
+    36:36:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> a
+    36:36:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):90 -> a
+    37:37:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):145:145 -> a
+    38:41:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):148:151 -> a
+    42:43:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):157:158 -> a
+    44:46:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):164:166 -> a
+    44:46:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):159 -> a
+    47:49:void removePinnedCandidate(com.android.tools.r8.graph.DexType):164:166 -> a
+    1:7:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):54:60 -> b
+    8:8:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> b
+    8:8:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):60 -> b
+    9:10:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):67:68 -> b
+    11:11:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1354:1354 -> b
+    11:11:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):68 -> b
+    12:12:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):73:73 -> b
+    13:16:void removePinnedCandidates():143:146 -> b
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.Ib:
     java.util.Map enumTypeToInfo -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>():20:22 -> <init>
     1:2:void addCandidate(com.android.tools.r8.graph.DexProgramClass):25:26 -> a
-    3:7:com.android.tools.r8.graph.DexProgramClass getCandidateClassOrNull(com.android.tools.r8.graph.DexType):54:58 -> a
-    8:10:com.android.tools.r8.utils.collections.ProgramMethodSet allMethodDependencies():62:64 -> a
-    11:15:void addMethodDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):73:77 -> a
-    16:20:void addRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):84:88 -> a
-    21:21:void forEachCandidate(java.util.function.Consumer):92:92 -> a
-    22:22:void lambda$forEachCandidate$0(java.util.function.Consumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):92:92 -> a
-    23:25:void forEachCandidateAndRequiredInstanceFieldData(java.util.function.BiConsumer):97:99 -> a
-    26:26:void lambda$forEachCandidateAndRequiredInstanceFieldData$1(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):100:100 -> a
-    1:1:boolean isCandidate(com.android.tools.r8.graph.DexType):34:34 -> b
-    2:6:com.android.tools.r8.com.google.common.collect.ImmutableSet candidateClasses():46:50 -> b
-    1:1:void removeCandidate(com.android.tools.r8.graph.DexType):30:30 -> c
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():42:42 -> c
-    1:1:void clear():104:104 -> d
-    1:1:boolean isEmpty():38:38 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Gb:
+    3:7:com.android.tools.r8.graph.DexProgramClass getCandidateClassOrNull(com.android.tools.r8.graph.DexType):58:62 -> a
+    8:10:com.android.tools.r8.utils.collections.ProgramMethodSet allMethodDependencies():66:68 -> a
+    11:15:void addMethodDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):77:81 -> a
+    16:20:void addRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88:92 -> a
+    21:21:void forEachCandidate(java.util.function.Consumer):96:96 -> a
+    22:22:void lambda$forEachCandidate$0(java.util.function.Consumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):96:96 -> a
+    23:25:void forEachCandidateAndRequiredInstanceFieldData(java.util.function.BiConsumer):101:103 -> a
+    26:26:void lambda$forEachCandidateAndRequiredInstanceFieldData$1(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):104:104 -> a
+    1:1:void removeCandidate(com.android.tools.r8.graph.DexProgramClass):30:30 -> b
+    2:2:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.removeCandidate(com.android.tools.r8.graph.DexType):34:34 -> b
+    2:2:void removeCandidate(com.android.tools.r8.graph.DexProgramClass):30 -> b
+    3:3:boolean isCandidate(com.android.tools.r8.graph.DexType):38:38 -> b
+    4:8:com.android.tools.r8.com.google.common.collect.ImmutableSet candidateClasses():50:54 -> b
+    1:1:void removeCandidate(com.android.tools.r8.graph.DexType):34:34 -> c
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():46:46 -> c
+    1:1:void clear():108:108 -> d
+    1:1:boolean isEmpty():42:42 -> e
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Hb:
     java.util.Set requiredInstanceFieldData -> c
     com.android.tools.r8.utils.collections.ProgramMethodSet methodDependencies -> b
     com.android.tools.r8.graph.DexProgramClass enumClass -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():107:107 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):113:113 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexProgramClass):110:115 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):107:107 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass getEnumClass():119:119 -> a
-    3:3:void addMethodDependency(com.android.tools.r8.graph.ProgramMethod):123:123 -> a
-    4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):127:127 -> a
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):107:107 -> b
-    2:2:java.util.Set getRequiredInstanceFieldData():131:131 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.Mb:
+    1:1:void <clinit>():111:111 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):117:117 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexProgramClass):114:119 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):111:111 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass getEnumClass():123:123 -> a
+    3:3:void addMethodDependency(com.android.tools.r8.graph.ProgramMethod):127:127 -> a
+    4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):131:131 -> a
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):111:111 -> b
+    2:2:java.util.Set getRequiredInstanceFieldData():135:135 -> b
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.Nb:
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Ob:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Pb:
     boolean $assertionsDisabled -> o
     java.util.Map prototypeChangesPerMethod -> n
     1:1:void <clinit>():22:22 -> <clinit>
@@ -46916,7 +47249,7 @@
     1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):42:43 -> a
     1:4:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):49:52 -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder():58:58 -> l
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Nb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Ob:
     java.util.Map typeMap -> a
     java.util.Map prototypeChangesPerMethod -> d
     boolean $assertionsDisabled -> e
@@ -46929,7 +47262,7 @@
     33:35:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):127 -> a
     36:36:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):124:124 -> a
     37:43:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):131:137 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Pb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Qb:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.AppView appView -> a
@@ -47194,7 +47527,7 @@
     59:104:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):275 -> h
     105:105:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():627:627 -> h
     105:105:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):275 -> h
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Qb:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Rb:
     java.util.Map unboxedEnumsMethods -> a
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator relocator -> f
@@ -47277,7 +47610,7 @@
     176:176:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):237 -> a
     1:1:java.util.List lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexType):70:70 -> b
     2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Tb:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Ub:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -47382,7 +47715,7 @@
     60:60:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
     60:60:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):122 -> b
     61:67:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):123:129 -> b
-    68:68:boolean com.android.tools.r8.graph.DexClass.isFinal():601:601 -> b
+    68:68:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> b
     68:68:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):130 -> b
     69:87:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):135:153 -> b
     88:88:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> b
@@ -47391,8 +47724,8 @@
     94:94:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
     94:94:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):158 -> b
     95:97:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):158:160 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.Rb:
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Sb:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.Sb:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Tb:
     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
@@ -47400,7 +47733,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):355:355 -> <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):368:373 -> <init>
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.MF:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.mG:
     com.android.tools.r8.com.google.common.collect.ImmutableMap relocationMap -> b
     com.android.tools.r8.graph.DexType defaultEnumUnboxingUtility -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1):36:36 -> <init>
@@ -47410,8 +47743,8 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):666:666 -> a
     3:3:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):54 -> a
     4:4:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):54:54 -> a
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1 -> com.android.tools.r8.internal.KF:
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.LF:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1 -> com.android.tools.r8.internal.kG:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.lG:
     java.util.Map relocationMap -> b
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.graph.DexProgramClass defaultEnumUnboxingUtility -> a
@@ -47431,38 +47764,73 @@
     40:40:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags):54:54 -> a
     40:40:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):144 -> a
     41:80:com.android.tools.r8.graph.DexProgramClass synthesizeUtilityClass(java.util.Set,java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):143:182 -> a
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.Ly:
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason NO_INIT -> o
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_CLINIT -> q
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_ON_ARRAY -> s
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason UNSUPPORTED_LIBRARY_CALL -> u
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason SUBTYPES -> g
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason GENERIC_INVOKE -> i
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason UNEXPECTED_STATIC_FIELD -> k
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason CONST_CLASS -> m
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason OTHER_UNSUPPORTED_INSTRUCTION -> B
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ACCESSIBILITY -> c
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason PINNED -> e
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_ARRAY_PUT -> x
-    java.lang.String message -> a
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_IF_TYPES -> z
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INIT -> p
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE -> r
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason IMPLICIT_UP_CAST_IN_RETURN -> t
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason MISSING_INSTANCE_FIELD_DATA -> v
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason MANY_INSTANCE_FIELDS -> h
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DEFAULT_METHOD_INVOKE -> j
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason UNRESOLVABLE_FIELD -> l
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_PHI -> n
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ELIGIBLE -> b
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> A
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ANNOTATION -> d
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DOWN_CAST -> f
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_FIELD_PUT -> w
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason TYPE_MISMATCH_FIELD_PUT -> y
-    1:29:void <clinit>():8:36 -> <clinit>
-    1:2:void <init>(java.lang.String):41:42 -> <init>
-    1:1:java.lang.String toString():47:47 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.mz:
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_ON_ARRAY -> p
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CLASSPATH -> o
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_FIELD_PUT -> r
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason IMPLICIT_UP_CAST_IN_RETURN -> q
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason TYPE_MISMATCH_FIELD_PUT -> t
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_ARRAY_PUT -> s
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> v
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_IF_TYPES -> u
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DEFAULT_METHOD_INVOKE -> h
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason MANY_INSTANCE_FIELDS -> g
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason CONST_CLASS -> j
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason UNRESOLVABLE_FIELD -> i
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INIT -> l
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_PHI -> k
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE -> n
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_CLINIT -> m
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ACCESSIBILITY -> b
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ELIGIBLE -> a
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason PINNED -> d
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ANNOTATION -> c
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason SUBTYPES -> f
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DOWN_CAST -> e
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason OTHER_UNSUPPORTED_INSTRUCTION -> w
+    1:27:void <clinit>():12:38 -> <clinit>
+    1:1:void <init>():11:11 -> <init>
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.dz:
+    com.android.tools.r8.graph.DexMethod invokedMethod -> x
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):69:70 -> <init>
+    1:1:java.lang.String toString():80:80 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingContentsForEnumValuesArrayReason -> com.android.tools.r8.internal.ez:
+    com.android.tools.r8.graph.DexField valuesField -> x
+    1:2:void <init>(com.android.tools.r8.graph.DexField):101:102 -> <init>
+    1:1:java.lang.String toString():112:112 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingEnumStaticFieldValuesReason -> com.android.tools.r8.internal.fz:
+    1:1:void <init>():84:84 -> <init>
+    1:1:java.lang.String toString():93:93 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.gz:
+    com.android.tools.r8.graph.DexField instanceField -> z
+    com.android.tools.r8.graph.DexField enumField -> x
+    int ordinal -> y
+    boolean $assertionsDisabled -> A
+    1:1:void <clinit>():116:116 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):123:126 -> <init>
+    5:8:void <init>(int,com.android.tools.r8.graph.DexField):129:132 -> <init>
+    1:12:java.lang.String toString():142:153 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingObjectStateForEnumInstanceReason -> com.android.tools.r8.internal.hz:
+    com.android.tools.r8.graph.DexField enumField -> x
+    1:2:void <init>(com.android.tools.r8.graph.DexField):162:163 -> <init>
+    1:1:java.lang.String toString():173:173 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.iz:
+    java.lang.String message -> x
+    1:2:void <init>(java.lang.String):50:51 -> <init>
+    1:1:java.lang.String toString():61:61 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.jz:
+    com.android.tools.r8.graph.DexField instanceField -> y
+    int ordinal -> x
+    1:3:void <init>(int,com.android.tools.r8.graph.DexField):182:184 -> <init>
+    1:4:java.lang.String toString():194:197 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.kz:
+    com.android.tools.r8.graph.DexMethod invokedMethod -> x
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):206:207 -> <init>
+    1:1:java.lang.String toString():217:217 -> toString
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedStaticFieldReason -> com.android.tools.r8.internal.lz:
+    com.android.tools.r8.graph.DexField field -> x
+    1:2:void <init>(com.android.tools.r8.graph.DexField):225:226 -> <init>
+    1:1:java.lang.String toString():236:236 -> toString
 com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo -> com.android.tools.r8.internal.a:
     com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
@@ -47504,7 +47872,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo bottom():23:23 -> c
     boolean isTop() -> d
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():27:27 -> e
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.x8:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.y8:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicUpperBoundTypes -> c
@@ -47612,7 +47980,7 @@
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> i
     boolean valueHasBeenPropagated() -> j
 com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.ir.optimize.info.d:
-    com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback INSTANCE -> b
+    com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback INSTANCE -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:void recordLibraryFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
@@ -47654,7 +48022,7 @@
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference Default -> c
     1:3:void <clinit>():22:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.ir:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.Br:
     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
@@ -47881,7 +48249,7 @@
     875:883:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):635:643 -> a
     884:893: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):710:719 -> a
     884:893:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):643 -> a
-    894:894:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
+    894:894:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():170:170 -> a
     894:894: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):720 -> a
     894:894:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):643 -> a
     895:895: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):721:721 -> a
@@ -47912,7 +48280,7 @@
     979:990: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
     991:999:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):933:941 -> a
     1000:1003:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexProgramClass):911:914 -> a
-    1004:1004:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isJavaLambdaMergingEnabled():1213:1213 -> a
+    1004:1004:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isJavaLambdaMergingEnabled():1216:1216 -> a
     1004:1004:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexProgramClass):915 -> a
     1005:1023: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):1053:1071 -> a
     1024:1055: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):1066:1097 -> a
@@ -47920,7 +48288,7 @@
     1056:1101: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):1098 -> a
     1102:1102:boolean lambda$isNonNullOnNormalExit$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1069:1069 -> a
     boolean lambda$computeMayHaveSideEffects$3(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.hr:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.Ar:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> d
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> c
@@ -47934,41 +48302,51 @@
     int flags -> c
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> b
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> f
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:11:void <init>():25:35 -> <init>
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:11:void <init>():27:37 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
-    1:12:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):39:50 -> a
-    13:13:void setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):69:69 -> a
-    14:14:void fixupAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):73:73 -> a
-    15:15:void joinReadBits(int):82:82 -> a
-    16:16:void setDynamicLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):100:100 -> a
-    17:17:void setDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement):109:109 -> a
-    1:1:boolean cannotBeKept():87:87 -> b
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue():65:65 -> c
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():96:96 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():105:105 -> e
-    1:1:int getReadBits():78:78 -> f
-    1:1:boolean isDead():114:114 -> g
-    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():58:59 -> i
-    1:1:boolean valueHasBeenPropagated():123:123 -> j
-    1:1:void markAsDead():118:118 -> k
-    1:1:void markAsPropagated():127:127 -> l
-    1:1:void markCannotBeKept():91:91 -> m
+    1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):48:53 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):53 -> a
+    8:13:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):54:59 -> a
+    14:14:void setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):78:78 -> a
+    15:15:void fixupAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):82:82 -> a
+    16:16:void joinReadBits(int):91:91 -> a
+    17:17:void setDynamicLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):109:109 -> a
+    18:18:void setDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement):118:118 -> a
+    1:1:boolean cannotBeKept():96:96 -> b
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue():74:74 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():105:105 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():114:114 -> e
+    1:1:int getReadBits():87:87 -> f
+    1:1:boolean isDead():123:123 -> g
+    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():67:68 -> i
+    1:1:boolean valueHasBeenPropagated():132:132 -> j
+    1:1:void markAsDead():127:127 -> k
+    1:1:void markAsPropagated():136:136 -> l
+    1:1:void markCannotBeKept():100:100 -> m
 com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.ir.optimize.info.g:
-    1:1:void <init>():18:18 -> <init>
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:1:void <init>():19:19 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
-    1:1:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):32:32 -> a
-    2:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):31:31 -> a
-    3:4:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):34:35 -> a
+    1:1:void fixupOptimizationInfos(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):40:40 -> a
+    2:4:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):43:45 -> a
+    5:5:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
+    5:5:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):45 -> a
+    6:8:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):46:48 -> a
+    9:9:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> a
+    9:9:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    10:18:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):48:56 -> a
 com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.ir.optimize.info.g$a:
-    void fixup(com.android.tools.r8.graph.DexEncodedField) -> a
-    void fixup(com.android.tools.r8.graph.DexEncodedMethod) -> a
+    void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo) -> a
+    void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo) -> a
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.ir.optimize.info.h:
-    java.util.Map fieldOptimizationInfos -> b
-    java.util.Map methodOptimizationInfos -> c
-    java.util.Map processed -> d
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.shaking.AppInfoWithLivenessModifier appInfoWithLivenessModifier -> a
+    java.util.Map fieldOptimizationInfos -> c
+    java.util.Map methodOptimizationInfos -> d
+    boolean $assertionsDisabled -> f
+    java.util.Map processed -> e
+    com.android.tools.r8.shaking.AppInfoWithLivenessModifier appInfoWithLivenessModifier -> b
     1:1:void <clinit>():32:32 -> <clinit>
     1:10:void <init>():32:41 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):67:67 -> a
@@ -47977,28 +48355,27 @@
     3:3:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):67:67 -> a
     3:3:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):293 -> a
     4:4:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):293:293 -> a
-    5:6:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):74:75 -> a
-    7:7:void modifyAppInfoWithLiveness(java.util.function.Consumer):80:80 -> a
-    8:8:void refineAppInfoWithLiveness(com.android.tools.r8.shaking.AppInfoWithLiveness):84:84 -> a
-    9:9:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):92:92 -> a
-    10:15:boolean noUpdatesLeft():109:114 -> a
-    16:16:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):122:122 -> a
-    17:17:void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeElement):137:137 -> a
-    18:18:void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeElement):142:142 -> a
-    19:19:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):147:147 -> a
-    20:25:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):153:158 -> a
-    26:32:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):154:160 -> a
-    33:34:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):184:185 -> a
-    35:35:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):190:190 -> a
-    36:37:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):196:197 -> a
-    38:38:void methodReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):209:209 -> a
-    39:39:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):215:215 -> a
-    40:40:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):220:220 -> a
-    41:41:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):240:240 -> a
-    42:42:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):252:252 -> a
-    43:43:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):257:257 -> a
-    44:45:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):271:272 -> a
-    46:46:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):282:282 -> a
+    5:5:void modifyAppInfoWithLiveness(java.util.function.Consumer):80:80 -> a
+    6:6:void refineAppInfoWithLiveness(com.android.tools.r8.shaking.AppInfoWithLiveness):84:84 -> a
+    7:7:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):92:92 -> a
+    8:13:boolean noUpdatesLeft():109:114 -> a
+    14:14:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):122:122 -> a
+    15:15:void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeElement):137:137 -> a
+    16:16:void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeElement):142:142 -> a
+    17:17:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):147:147 -> a
+    18:23:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):153:158 -> a
+    24:30:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):154:160 -> a
+    31:32:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):184:185 -> a
+    33:33:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):190:190 -> a
+    34:35:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):196:197 -> a
+    36:36:void methodReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):209:209 -> a
+    37:37:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):215:215 -> a
+    38:38:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):220:220 -> a
+    39:39:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):240:240 -> a
+    40:40:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):252:252 -> a
+    41:41:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):257:257 -> a
+    42:43:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):271:272 -> a
+    44:44:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):282:282 -> a
     1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):45:50 -> b
     7:9:void updateVisibleOptimizationInfo():91:91 -> b
     11:23:void updateVisibleOptimizationInfo():93:105 -> b
@@ -48013,7 +48390,7 @@
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> g
     1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):56:61 -> h
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.optimize.info.i:
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> b
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():28:28 -> <init>
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
@@ -48046,7 +48423,7 @@
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.i$a:
     1:1:void <init>():26:26 -> <init>
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.ir.optimize.info.j:
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> b
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():28:28 -> <init>
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
@@ -48079,7 +48456,7 @@
     1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):203:203 -> f
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> g
     1:1:void unsetAbstractReturnValue(com.android.tools.r8.graph.DexEncodedMethod):110:110 -> h
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.RE:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.tF:
     com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -48100,88 +48477,88 @@
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection instanceInitializerInfoCollection -> i
     com.android.tools.r8.ir.analysis.type.ClassTypeElement returnsObjectWithLowerBoundType -> f
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractReturnValue -> c
-    1:70:void <clinit>():28:97 -> <clinit>
+    1:70:void <clinit>():29:98 -> <clinit>
     71:71:boolean com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.mayHaveSideEffects():181:181 -> <clinit>
-    71:71:void <clinit>():100 -> <clinit>
-    72:95:void <clinit>():100:123 -> <clinit>
-    1:1:void <init>():128:128 -> <init>
-    2:98:void <init>():30:126 -> <init>
-    99:99:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):134:134 -> <init>
-    100:216:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):30:146 -> <init>
-    1:1:boolean returnsArgument():296:296 -> A
-    1:1:boolean triggersClassInitBeforeAnySideEffect():351:351 -> B
-    1:29:void adjustOptimizationInfoAfterRemovingThisParameter():494:522 -> C
-    30:30:void markCheckNullReceiverBeforeAnySideEffect(boolean):471:471 -> C
-    30:30:void adjustOptimizationInfoAfterRemovingThisParameter():522 -> C
-    31:31:void markTriggerClassInitBeforeAnySideEffect(boolean):475:475 -> C
-    31:31:void adjustOptimizationInfoAfterRemovingThisParameter():525 -> C
+    71:71:void <clinit>():101 -> <clinit>
+    72:95:void <clinit>():101:124 -> <clinit>
+    1:1:void <init>():129:129 -> <init>
+    2:98:void <init>():31:127 -> <init>
+    99:99:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):135:135 -> <init>
+    100:216:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):31:147 -> <init>
+    1:1:boolean returnsArgument():304:304 -> A
+    1:1:boolean triggersClassInitBeforeAnySideEffect():359:359 -> B
+    1:29:void adjustOptimizationInfoAfterRemovingThisParameter():502:530 -> C
+    30:30:void markCheckNullReceiverBeforeAnySideEffect(boolean):479:479 -> C
+    30:30:void adjustOptimizationInfoAfterRemovingThisParameter():530 -> C
+    31:31:void markTriggerClassInitBeforeAnySideEffect(boolean):483:483 -> C
+    31:31:void adjustOptimizationInfoAfterRemovingThisParameter():533 -> C
     32:32:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection.empty():21:21 -> C
-    32:32:void adjustOptimizationInfoAfterRemovingThisParameter():528 -> C
-    33:46:void adjustOptimizationInfoAfterRemovingThisParameter():528:541 -> C
-    1:1:void markAsPropagated():480:480 -> D
-    1:1:void markCannotBeKept():224:224 -> E
-    1:1:void markClassInitializerMayBePostponed():233:233 -> F
-    1:2:void markForceInline():452:453 -> G
-    1:1:void markInlinedIntoSingleCallSite():286:286 -> H
-    1:1:void markMayNotHaveSideEffects():400:400 -> I
-    1:1:void markNeverReturnsNormally():408:408 -> J
-    1:1:void markReturnValueOnlyDependsOnArguments():404:404 -> K
-    1:1:void setInitializerEnablingJavaAssertions():386:386 -> L
-    1:1:void unsetAbstractReturnValue():418:418 -> M
-    1:2:void unsetForceInline():459:460 -> N
+    32:32:void adjustOptimizationInfoAfterRemovingThisParameter():536 -> C
+    33:46:void adjustOptimizationInfoAfterRemovingThisParameter():536:549 -> C
+    1:1:void markAsPropagated():488:488 -> D
+    1:1:void markCannotBeKept():232:232 -> E
+    1:1:void markClassInitializerMayBePostponed():241:241 -> F
+    1:2:void markForceInline():460:461 -> G
+    1:1:void markInlinedIntoSingleCallSite():294:294 -> H
+    1:1:void markMayNotHaveSideEffects():408:408 -> I
+    1:1:void markNeverReturnsNormally():416:416 -> J
+    1:1:void markReturnValueOnlyDependsOnArguments():412:412 -> K
+    1:1:void setInitializerEnablingJavaAssertions():394:394 -> L
+    1:1:void unsetAbstractReturnValue():426:426 -> M
+    1:2:void unsetForceInline():467:468 -> N
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> a
-    1:13:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):151:163 -> a
-    14:14:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):171:171 -> a
-    15:15:void setFlag(int):191:191 -> a
-    15:15:void setFlag(int,boolean):184 -> a
-    16:16:void clearFlag(int):195:195 -> a
-    16:16:void setFlag(int,boolean):186 -> a
-    17:17:void clearFlag(int):195:195 -> a
-    18:18:void setClassInlinerMethodConstraint(com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):242:242 -> a
-    19:19:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):267:267 -> a
-    20:20:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):316:316 -> a
-    21:21:void setNonNullParamOnNormalExits(java.util.BitSet):369:369 -> a
-    22:22:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):377:377 -> a
-    23:23:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):382:382 -> a
-    24:24:void markInitializesClassesOnNormalExit(java.util.Set):390:390 -> a
-    25:27:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):412:414 -> a
-    28:37:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):422:431 -> a
-    38:43:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):430:435 -> a
-    44:48:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):440:444 -> a
-    49:52:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):443:446 -> a
-    53:53:void markCheckNullReceiverBeforeAnySideEffect(boolean):471:471 -> a
-    1:2:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):177:178 -> b
-    3:3:boolean isFlagSet(int):199:199 -> b
-    4:4:boolean cannotBeKept():219:219 -> b
-    5:5:void setNonNullParamOrThrow(java.util.BitSet):365:365 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):475:475 -> b
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():346:346 -> c
-    2:2:void setReachabilitySensitive(boolean):373:373 -> c
-    3:5:void markReturnsArgument(int):394:396 -> c
-    1:1:void setFlag(int):191:191 -> d
-    2:2:boolean classInitializerMayBePostponed():229:229 -> d
-    1:1:boolean forceInline():336:336 -> e
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():321:321 -> f
-    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():312:312 -> g
-    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():238:238 -> h
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():262:262 -> i
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():252:252 -> j
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():247:247 -> k
-    1:1:java.util.Set getInitializedClassesOnNormalExit():257:257 -> l
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():277:277 -> m
-    1:1:java.util.BitSet getNonNullParamOrThrow():272:272 -> n
-    1:2:int getReturnedArgument():301:302 -> o
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():326:326 -> p
+    1:13:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):159:171 -> a
+    14:14:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):179:179 -> a
+    15:15:void setFlag(int):199:199 -> a
+    15:15:void setFlag(int,boolean):192 -> a
+    16:16:void clearFlag(int):203:203 -> a
+    16:16:void setFlag(int,boolean):194 -> a
+    17:17:void clearFlag(int):203:203 -> a
+    18:18:void setClassInlinerMethodConstraint(com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):250:250 -> a
+    19:19:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):275:275 -> a
+    20:20:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):324:324 -> a
+    21:21:void setNonNullParamOnNormalExits(java.util.BitSet):377:377 -> a
+    22:22:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):385:385 -> a
+    23:23:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):390:390 -> a
+    24:24:void markInitializesClassesOnNormalExit(java.util.Set):398:398 -> a
+    25:27:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):420:422 -> a
+    28:37:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):430:439 -> a
+    38:43:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):438:443 -> a
+    44:48:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):448:452 -> a
+    49:52:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):451:454 -> a
+    53:53:void markCheckNullReceiverBeforeAnySideEffect(boolean):479:479 -> a
+    1:2:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):185:186 -> b
+    3:3:boolean isFlagSet(int):207:207 -> b
+    4:4:boolean cannotBeKept():227:227 -> b
+    5:5:void setNonNullParamOrThrow(java.util.BitSet):373:373 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):483:483 -> b
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():354:354 -> c
+    2:2:void setReachabilitySensitive(boolean):381:381 -> c
+    3:5:void markReturnsArgument(int):402:404 -> c
+    1:1:void setFlag(int):199:199 -> d
+    2:2:boolean classInitializerMayBePostponed():237:237 -> d
+    1:1:boolean forceInline():344:344 -> e
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():329:329 -> f
+    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():320:320 -> g
+    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():246:246 -> h
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():270:270 -> i
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():260:260 -> j
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():255:255 -> k
+    1:1:java.util.Set getInitializedClassesOnNormalExit():265:265 -> l
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():285:285 -> m
+    1:1:java.util.BitSet getNonNullParamOrThrow():280:280 -> n
+    1:2:int getReturnedArgument():309:310 -> o
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():334:334 -> p
     boolean isDefaultMethodOptimizationInfo() -> q
-    1:1:boolean isInitializerEnablingJavaVmAssertions():331:331 -> r
-    1:1:boolean isReachabilitySensitive():291:291 -> s
+    1:1:boolean isInitializerEnablingJavaVmAssertions():339:339 -> r
+    1:1:boolean isReachabilitySensitive():299:299 -> s
     boolean isUpdatableMethodOptimizationInfo() -> t
-    1:1:boolean mayHaveSideEffects():356:356 -> u
-    1:1:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():490:490 -> v
-    1:1:boolean neverInline():341:341 -> w
-    1:1:boolean neverReturnsNormally():307:307 -> x
-    1:1:boolean returnValueHasBeenPropagated():485:485 -> y
-    1:1:boolean returnValueOnlyDependsOnArguments():361:361 -> z
+    1:1:boolean mayHaveSideEffects():364:364 -> u
+    1:1:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():498:498 -> v
+    1:1:boolean neverInline():349:349 -> w
+    1:1:boolean neverReturnsNormally():315:315 -> x
+    1:1:boolean returnValueHasBeenPropagated():493:493 -> y
+    1:1:boolean returnValueOnlyDependsOnArguments():369:369 -> z
 com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.o3:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -48206,13 +48583,13 @@
     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.GG:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.cH:
     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.eb:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.fb:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -48223,7 +48600,7 @@
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():27:27 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.wg:
     int argumentIndex -> a
     1:2:void <init>(int):20:21 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
@@ -48231,14 +48608,14 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> f
     boolean isArgumentInitializationInfo() -> h
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.cg:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.xg:
     boolean isTypeInitializationInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> f
     boolean isSingleValue() -> g
     boolean isArgumentInitializationInfo() -> h
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> j
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.eg:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.zg:
     1:1:void <init>():23:23 -> <init>
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -48246,30 +48623,34 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():26:26 -> a
     void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.dg:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.yg:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():44:44 -> <clinit>
     1:3:void <init>():44:46 -> <init>
     1:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder recordInitializationInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):54:55 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():60:63 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Ag:
     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.hg:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.Cg:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> a
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):26:28 -> <init>
     boolean isTypeInitializationInfo() -> a
-    1:16:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):52:67 -> a
-    17:21:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):66:70 -> a
-    22:22:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):69:69 -> a
-    1:6:boolean equals(java.lang.Object):83:88 -> equals
-    1:1:int hashCode():75:75 -> hashCode
-    1:1:java.lang.String toString():93:93 -> toString
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Ws:
+    1:13:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):52:64 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
+    14:14:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):65 -> a
+    15:17:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):65:67 -> a
+    18:18:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):88:88 -> a
+    18:18:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):67 -> a
+    19:19:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):67:67 -> a
+    1:6:boolean equals(java.lang.Object):80:85 -> equals
+    1:1:int hashCode():72:72 -> hashCode
+    1:1:java.lang.String toString():90:90 -> toString
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.qt:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -48285,14 +48666,14 @@
     boolean isEmpty() -> b
     1:1:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):55:55 -> b
     1:4:java.lang.String toString():86:89 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.WF:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.wG:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():23:23 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.V8:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.W8:
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo info -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo):17:18 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.get(com.android.tools.r8.ir.code.InvokeDirect):28:28 -> a
@@ -48301,7 +48682,7 @@
     2:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):12 -> a
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.getContextInsensitive():23:23 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():12 -> b
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.y9:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.z9:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
@@ -48313,7 +48694,7 @@
     boolean receiverNeverEscapesOutsideConstructorChain() -> h
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():24:24 -> i
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.fb:
+com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.gb:
     com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection EMPTY -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -48323,7 +48704,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection.getContextInsensitive():25:25 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():12 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection getInstance():20:20 -> c
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Fg:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> b
@@ -48333,7 +48714,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> f
     1:1:boolean receiverMayEscapeOutsideConstructorChain():68:68 -> g
     boolean receiverNeverEscapesOutsideConstructorChain() -> h
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.lg:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.Gg:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> a
     1:1:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.isNonTrivialInstanceInitializerInfo():0:0 -> a
@@ -48344,7 +48725,7 @@
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection empty():21:21 -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> b
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.Zs:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.tt:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -48367,8 +48748,8 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():77:77 -> f
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():92:92 -> h
     1:1:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.Xs:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.Ys:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.rt:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.st:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -48425,7 +48806,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():180:180 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():189:189 -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():194:194 -> h
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.x9:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.y9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.ir.optimize.Inliner inliner -> c
@@ -48440,10 +48821,10 @@
     28:30:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     31:33:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):58:60 -> a
     34:35:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):40:41 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Qc:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Rc:
     1:1:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):22:22 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.og:
     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
@@ -48452,7 +48833,7 @@
     7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33 -> a
     8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Uf:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.pg:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
@@ -48470,9 +48851,9 @@
     1:7:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):36:42 -> b
     8:9:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):36:37 -> b
     8:9:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):42 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.rg:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.at:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.ut:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -48510,7 +48891,7 @@
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> y
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.NG:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.jH:
     1:1:void <init>():18:18 -> <init>
     void reportCallerNotSameClass() -> a
     void reportIncorrectArity(int,int) -> a
@@ -48547,7 +48928,7 @@
     void reportRecursiveMethod() -> v
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.OG:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.kH:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.ProgramMethod callee -> a
@@ -48620,7 +49001,7 @@
     31:37:void com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):97:97 -> a
     31:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):49 -> a
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> getType
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.Bb:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.Cb:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
     1:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):42:43 -> a
@@ -48632,18 +49013,18 @@
     26:27:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):75:76 -> a
     26:27:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):44 -> a
     1:1:com.android.tools.r8.graph.DexType getType():32:32 -> getType
-com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.Fo:
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.cp:
     1:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29:31 -> a
     4:4:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.graph.DexLibraryClass.asLibraryClassOrNull(com.android.tools.r8.graph.DexClass):72:72 -> a
     4:4:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
     5:5:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33:33 -> a
-    6:7:void com.android.tools.r8.graph.DexItemFactory$EnumMembers.forEachField(java.util.function.Consumer):1518:1519 -> a
+    6:7:void com.android.tools.r8.graph.DexItemFactory$EnumMembers.forEachField(java.util.function.Consumer):1544:1545 -> a
     6:7:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33 -> a
     8:16:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):35:43 -> a
     17:17:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):63:63 -> a
     17:17:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):43 -> a
     18:18:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):37:37 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.Ho:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.ep:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryMethodModelCollections -> d
     java.util.Set modeledLibraryTypes -> c
@@ -48677,11 +49058,11 @@
     52:52:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):160 -> a
     53:53:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):160:160 -> a
     54:54:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State lambda$optimize$1(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):149:149 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.Jo:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.gp:
     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.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.Io:
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.No:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.kp:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
@@ -48702,7 +49083,7 @@
     1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$1(com.android.tools.r8.graph.DexMethod,java.util.List):49:49 -> b
     2:2:boolean lambda$buildFinalMethodsWithoutSideEffects$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List):53:53 -> b
     3:26:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):68:91 -> b
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.Po:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.mp:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> a
@@ -48774,7 +49155,7 @@
     74:74:void run(java.util.Set):52:52 -> a
     75:75:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():167:167 -> a
     75:75:void run(java.util.Set):53 -> a
-    76:76:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1357:1357 -> a
+    76:76:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1372:1372 -> a
     76:76:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():167 -> a
     76:76:void run(java.util.Set):53 -> a
     77:80:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():167:170 -> a
@@ -48790,7 +49171,7 @@
     3:3:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):176 -> b
     4:6:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):177:179 -> b
     1:3:void modelLibraryMethodsWithoutSideEffects():155:157 -> c
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.up:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.Rp:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexMethod wtfMethod -> j
     com.android.tools.r8.graph.DexMethod eMethod -> i
@@ -48812,32 +49193,32 @@
     4:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):109:143 -> a
     39:42:void replaceInvokeWithConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,int):150:153 -> a
     1:1:com.android.tools.r8.graph.DexType getType():99:99 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.ru:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.Lu:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):37:37 -> a
     2:4:void com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer.optimizeGetClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):43:45 -> a
     2:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):38 -> a
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.Eu:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.Yu:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> d
     1:5:void <init>(com.android.tools.r8.graph.AppView):25:29 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):44:44 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():170:170 -> a
     2:2:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):53 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):45 -> a
     3:10:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):54:61 -> a
     3:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):45 -> a
     11:11:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):46:46 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
+    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():170:170 -> a
     12:12:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):70 -> a
     12:12:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):47 -> a
     13:30:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):71:88 -> a
     13:30:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):47 -> a
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> getType
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.ED:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -48846,7 +49227,7 @@
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):17:17 -> a
     2:2:void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):42:42 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):17 -> a
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.AD:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.bE:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -48859,11 +49240,11 @@
     6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):99:106 -> a
     6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):79 -> a
     6:13:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):42 -> a
-    14:14:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):1820:1820 -> a
+    14:14:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):1846:1846 -> a
     14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):107 -> a
     14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):79 -> a
     14:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):42 -> a
-    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):1812:1812 -> a
+    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):1838:1838 -> a
     15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):109 -> a
     15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):79 -> a
     15:15:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):42 -> a
@@ -48916,7 +49297,7 @@
     79:79:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor):42 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer):42:42 -> b
     1:1:com.android.tools.r8.graph.DexType getType():64:64 -> getType
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.AD$a:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.bE$a:
     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
@@ -48933,7 +49314,7 @@
     136:143:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):175 -> a
     144:152:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):243:251 -> a
     144:152:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):175 -> a
-    153:153:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):1824:1824 -> a
+    153:153:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):1850:1850 -> a
     153:153:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):251 -> a
     153:153:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):175 -> a
     154:154:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):234:234 -> a
@@ -48941,7 +49322,7 @@
     155:155:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):176:176 -> a
     156:156:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):176:176 -> a
     1:5:boolean isUnusedBuilder(com.android.tools.r8.ir.code.Value):164:168 -> b
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.GD:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.hE:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):30:32 -> <init>
@@ -48949,7 +49330,7 @@
     4:10:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeVirtual):57:63 -> a
     4:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):49 -> a
     11:12:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):50:51 -> a
-    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():164:164 -> a
+    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():170:170 -> a
     13:13:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):73 -> a
     13:13:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):51 -> a
     14:31:void com.android.tools.r8.ir.optimize.library.StringMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):74:91 -> a
@@ -48962,7 +49343,7 @@
     53:53:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):124 -> a
     54:56:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):124:126 -> a
     1:1:com.android.tools.r8.graph.DexType getType():37:37 -> getType
-com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.xj:
+com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.Tj:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:12:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):22:33 -> a
@@ -49015,7 +49396,7 @@
 com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.n2:
     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.Wa:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.Xa:
     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
@@ -49040,7 +49421,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.mp:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.Jp:
     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
@@ -49051,10 +49432,10 @@
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
     25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
     25:25:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.pq:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.Nq:
     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.Er:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.Xr:
     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
@@ -49087,12 +49468,12 @@
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     12:12:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):59 -> b
     13:13:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.qv:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.Kv:
     int getMin() -> a
     void setIndex(int) -> a
     java.util.function.Predicate getPredicate() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.rv:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.Lv:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -49103,7 +49484,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.sv:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.Mv:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -49112,7 +49493,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.Bv:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.Vv:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -49124,7 +49505,7 @@
     3:3:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     1:1:java.util.function.Predicate getPredicate():21:21 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.hA:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.IA:
     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
@@ -49134,14 +49515,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.qD:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.RD:
     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.rD:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.SD:
     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
@@ -49160,7 +49541,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.sD:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.TD:
     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
@@ -49186,7 +49567,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.RG:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.nH:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -49198,141 +49579,143 @@
     3:3:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
     1:1:java.util.function.Predicate getPredicate():22:22 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.g7:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.h7:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map referencedFrom -> d
     java.util.concurrent.ConcurrentHashMap candidates -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:109 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):103:112 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):54:54 -> a
-    2:54:void collectCandidates(com.android.tools.r8.graph.DexApplication):119:171 -> a
-    55:57:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):130:132 -> a
-    58:59:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):188:189 -> a
-    58:59:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):134 -> a
-    60:61:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):139:140 -> a
-    62:63:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):188:189 -> a
-    62:63:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):140 -> a
-    64:65:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144:145 -> a
-    66:67:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):188:189 -> a
-    66:67:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):146 -> a
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):110:110 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):104:113 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):55:55 -> a
+    2:54:void collectCandidates(com.android.tools.r8.graph.DexApplication):120:172 -> a
+    55:57:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):131:133 -> a
+    58:59:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
+    58:59:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):135 -> a
+    60:61:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):140:141 -> a
+    62:63:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
+    62:63:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):141 -> a
+    64:65:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145:146 -> a
+    66:67:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
+    66:67:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):147 -> a
     68:68:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
-    68:68:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148 -> a
-    69:69:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):149:149 -> a
-    70:71:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):188:189 -> a
-    70:71:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):149 -> a
-    72:84:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):154:166 -> a
-    85:86:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):188:189 -> a
-    85:86:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):166 -> a
-    87:91:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172:176 -> a
-    92:97:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):194:199 -> a
-    92:97:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):177 -> a
-    98:101:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):178:181 -> a
-    102:115:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):229:242 -> a
-    116:129:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):239:252 -> a
-    130:133:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):534:537 -> a
-    130:133:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):253 -> a
+    68:68:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):149 -> a
+    69:69:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):150:150 -> a
+    70:71:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
+    70:71:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):150 -> a
+    72:84:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):155:167 -> a
+    85:86:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
+    85:86:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):167 -> a
+    87:91:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:177 -> a
+    92:97:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):195:200 -> a
+    92:97:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):178 -> a
+    98:101:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):179:182 -> a
+    102:115:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):230:243 -> a
+    116:129:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):240:253 -> a
+    130:133:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):535:538 -> a
+    130:133:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
     134:134:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    134:134:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):537 -> a
-    134:134:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):253 -> a
-    135:140:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):538:543 -> a
-    135:140:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):253 -> a
+    134:134:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):538 -> a
+    134:134:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
+    135:140:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):539:544 -> a
+    135:140:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
     141:141:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    141:141:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):546 -> a
-    141:141:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):253 -> a
-    142:147:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):546:551 -> a
-    142:147:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):253 -> a
-    148:179:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):255:286 -> a
-    180:188:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393:401 -> a
-    180:188:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    189:189:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    189:189:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):404 -> a
-    189:189:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():88:88 -> a
-    190:190:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):84 -> a
-    190:190:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):404 -> a
-    190:190:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    191:231:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):407:447 -> a
-    191:231:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    232:232:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):482:482 -> a
-    232:232:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):447 -> a
-    232:232:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    233:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):450:465 -> a
-    233:248:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    249:255:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):517:523 -> a
-    249:255:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):466 -> a
-    249:255:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    256:265:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):467:476 -> a
-    256:265:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    266:272:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):289:295 -> a
-    273:274:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):384:385 -> a
-    273:274:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295 -> a
+    141:141:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):547 -> a
+    141:141:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
+    142:147:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):547:552 -> a
+    142:147:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
+    148:179:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):256:287 -> a
+    180:188:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):394:402 -> a
+    180:188:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    189:189:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
+    189:189:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):405 -> a
+    189:189:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
+    190:190:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):85 -> a
+    190:190:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):405 -> a
+    190:190:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    191:231:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):408:448 -> a
+    191:231:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    232:232:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):483:483 -> a
+    232:232:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):448 -> a
+    232:232:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    233:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):451:466 -> a
+    233:248:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    249:255:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):518:524 -> a
+    249:255:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):467 -> a
+    249:255:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    256:265:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):468:477 -> a
+    256:265:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
+    266:272:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):290:296 -> a
+    273:274:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):385:386 -> a
+    273:274:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
     275:275:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    275:275:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386 -> a
-    275:275:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295 -> a
-    276:276:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387:387 -> a
-    276:276:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295 -> a
+    275:275:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387 -> a
+    275:275:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
+    276:276:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):388:388 -> a
+    276:276:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
     277:282:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
-    277:282:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387 -> a
-    277:282:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295 -> a
-    283:283:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):388:388 -> a
-    283:283:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295 -> a
-    284:301:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296:313 -> a
+    277:282:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):388 -> a
+    277:282:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
+    283:283:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):389:389 -> a
+    283:283:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
+    284:301:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):297:314 -> a
     302:302:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    302:302:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):318 -> a
-    303:303:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):320:320 -> a
-    304:316:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):564:576 -> a
-    304:316:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):320 -> a
-    317:329:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):322:334 -> a
-    330:339:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):584:593 -> a
-    330:339:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):334 -> a
-    340:355:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):336:351 -> a
-    356:356:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    356:356:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):356 -> a
-    357:358:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):358:359 -> a
-    359:359:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    359:359:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):363 -> a
-    360:365:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):363:368 -> a
-    366:369:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):376:379 -> a
-    370:370:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):378:378 -> a
-    371:396:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):487:512 -> a
-    397:397:boolean lambda$isValidInitCall$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):497:497 -> a
-    398:403:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):600:605 -> a
-    404:406:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):604:606 -> a
-    407:410:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):616:619 -> a
-    411:411:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):635:635 -> a
-    412:412:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    412:412:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):635 -> a
-    413:444:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):636:667 -> a
-    445:445:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):692:692 -> a
-    1:1:boolean lambda$isValidValueUser$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):644:644 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.d7:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.e7:
+    302:302:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319 -> a
+    303:303:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321:321 -> a
+    304:312:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):565:573 -> a
+    304:312:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321 -> a
+    313:319:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):572:578 -> a
+    313:319:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321 -> a
+    320:332:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):323:335 -> a
+    333:342:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):586:595 -> a
+    333:342:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):335 -> a
+    343:358:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):337:352 -> a
+    359:359:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
+    359:359:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):357 -> a
+    360:361:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):359:360 -> a
+    362:362:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    362:362:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):364 -> a
+    363:368:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):364:369 -> a
+    369:372:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):377:380 -> a
+    373:373:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):379:379 -> a
+    374:399:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):488:513 -> a
+    400:400:boolean lambda$isValidInitCall$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):498:498 -> a
+    401:406:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):602:607 -> a
+    407:409:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):606:608 -> a
+    410:413:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):618:621 -> a
+    414:414:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):637:637 -> a
+    415:415:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    415:415:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
+    416:447:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):638:669 -> a
+    448:448:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):694:694 -> a
+    1:1:boolean lambda$isValidValueUser$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):646:646 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.e7:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.f7:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):695:695 -> <init>
-    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):697:698 -> <init>
-    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):723:723 -> a
-    2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):748:748 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):733:733 -> b
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):728:728 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):743:743 -> c
-    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):768:770 -> c
-    3:5:void registerInitClass(com.android.tools.r8.graph.DexType):713 -> c
-    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):738:738 -> d
-    2:4:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):768:770 -> d
-    2:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):776 -> d
-    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):718:718 -> e
-    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):758:758 -> e
-    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):768:770 -> e
-    3:5:void registerNewInstance(com.android.tools.r8.graph.DexType):753 -> e
-    1:2:void registerMethod(com.android.tools.r8.graph.DexMethod):702:703 -> f
-    3:5:void registerTypeReference(com.android.tools.r8.graph.DexType):768:770 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):763:763 -> g
-    1:2:void registerField(com.android.tools.r8.graph.DexField):707:708 -> i
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.f7:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):697:697 -> <init>
+    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):699:700 -> <init>
+    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):725:725 -> a
+    2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):750:750 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):735:735 -> b
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):730:730 -> c
+    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):745:745 -> c
+    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> c
+    3:5:void registerInitClass(com.android.tools.r8.graph.DexType):715 -> c
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):740:740 -> d
+    2:4:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> d
+    2:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):778 -> d
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):720:720 -> e
+    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):760:760 -> e
+    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> e
+    3:5:void registerNewInstance(com.android.tools.r8.graph.DexType):755 -> e
+    1:2:void registerMethod(com.android.tools.r8.graph.DexMethod):704:705 -> f
+    3:5:void registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):765:765 -> g
+    1:2:void registerField(com.android.tools.r8.graph.DexField):709:710 -> i
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.g7:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -49342,20 +49725,20 @@
     com.android.tools.r8.graph.DexProgramClass candidate -> a
     java.util.concurrent.atomic.AtomicReference constructor -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> h
-    1:1:void <clinit>():62:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):65:80 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass hostClass():92:92 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():88:88 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass hostClass():92 -> a
-    3:4:com.android.tools.r8.graph.DexProgramClass hostClass():92:93 -> a
-    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():98:98 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.h7:
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):74:74 -> <init>
+    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):66:81 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass hostClass():93:93 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass hostClass():93 -> a
+    3:4:com.android.tools.r8.graph.DexProgramClass hostClass():93:94 -> a
+    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():99:99 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.i7:
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):20:20 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):25:27 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.PD:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
@@ -49376,7 +49759,7 @@
     2:5:void lambda$run$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):121:124 -> a
     6:6:void lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):130:130 -> a
     7:16:java.util.Map finalEligibilityCheck():160:169 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():88:88 -> a
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
     17:17:java.util.Map finalEligibilityCheck():170 -> a
     18:122:java.util.Map finalEligibilityCheck():171:275 -> a
     123:123:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
@@ -49472,7 +49855,7 @@
     42:42:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
     43:51:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():759:767 -> b
     43:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():88:88 -> b
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> b
     52:52:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():770 -> b
     52:52:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137 -> b
     53:57:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():771:775 -> b
@@ -49790,7 +50173,7 @@
     126:128:void removeTrivialBuilders():817:819 -> b
     1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):317:317 -> c
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):312:312 -> d
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.ID:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.jE:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -49854,7 +50237,7 @@
     211:211:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1029:1029 -> a
     211:211:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):299 -> a
     212:219:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):300:307 -> a
-    220:220:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1438:1438 -> a
+    220:220:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1453:1453 -> a
     220:220:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):307 -> a
     221:240:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):311:330 -> a
     241:241:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
@@ -49910,13 +50293,13 @@
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):224:224 -> h
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):226:226 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):228:228 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.HD:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.iE:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():571:571 -> <clinit>
     1:1:void <init>():574:574 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():577:577 -> 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):586:606 -> a
-com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.x5:
+com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.w5:
     1:4:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):35:38 -> a
 com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.Y5:
     com.android.tools.r8.graph.AppView appView -> a
@@ -49997,14 +50380,14 @@
     99:104:void computeLiveRanges():2498:2503 -> a
     99:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     99:104:void allocateRegisters():215 -> a
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1624:1624 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1634:1634 -> a
     105:105:void computeLiveRanges():2503 -> a
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     105:105:void allocateRegisters():215 -> a
     106:106:void computeLiveRanges():2503:2503 -> a
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     106:106:void allocateRegisters():215 -> a
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1633:1633 -> a
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1643:1643 -> a
     107:107:void computeLiveRanges():2503 -> a
     107:107:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> a
     107:107:void allocateRegisters():215 -> a
@@ -50411,16 +50794,16 @@
     1:3:int registersUsed():596:598 -> c
     4:9:int unadjustedRealRegisterFromAllocated(int):807:812 -> c
     10:10:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1507:1507 -> c
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1639:1639 -> c
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1649:1649 -> c
     11:11:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1507 -> c
     12:32:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1510:1530 -> c
     33:45:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1543:1555 -> c
     46:46:boolean registersAreFree(int,boolean):3118:3118 -> c
     1:1:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1672:1672 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1682:1682 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1846:1846 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1856:1856 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     5:19:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1463 -> d
     20:20:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> d
@@ -50431,12 +50814,12 @@
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477:1477 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1672:1672 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1682:1682 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1846:1846 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1856:1856 -> d
     30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     31:45:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1463 -> d
@@ -50699,7 +51082,7 @@
     1:1:boolean isLinked():138:138 -> x
     1:3:boolean isNewStringInstanceDisallowingSpilling():533:535 -> y
     1:1:boolean isSpilled():111:111 -> z
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.ip:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.Fp:
     int limit -> b
     int position -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -50711,7 +51094,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.kp:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.Hp:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> c
     int end -> b
     int start -> a
@@ -50721,7 +51104,7 @@
     2:5:int com.android.tools.r8.ir.regalloc.LiveRange.compareTo(com.android.tools.r8.ir.regalloc.LiveRange):20:23 -> compareTo
     2:5:int compareTo(java.lang.Object):6 -> compareTo
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.Rz:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.sA:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     void allocateRegisters() -> a
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
@@ -50730,7 +51113,7 @@
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     com.android.tools.r8.utils.InternalOptions options() -> b
     int registersUsed() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.Sz:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.tA:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> a
     com.android.tools.r8.ir.code.Instruction definition -> d
     boolean $assertionsDisabled -> e
@@ -50746,7 +51129,7 @@
     1:4:boolean writes(int):36:39 -> d
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.uA:
     java.util.Map valueMap -> b
     int tempRegister -> f
     java.util.Set moveSet -> a
@@ -50866,7 +51249,7 @@
     61:65:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     66:74:void removeArgumentRestores(java.util.Set):332:340 -> a
     75:99:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1608:1608 -> a
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1618:1618 -> a
     100:100:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     101:106:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     107:111:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -50913,25 +51296,25 @@
 com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.C3:
     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 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.R9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.S9:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):44:44 -> <init>
     1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):48:48 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):48 -> a
     3:6:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):51:54 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.N9:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):291:292 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():297:305 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():303:303 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():300:312 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.O9:
     com.android.tools.r8.graph.DexString message -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):323:324 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():329:339 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():337:337 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():334:343 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.P9:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -50952,7 +51335,7 @@
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():133 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():132:132 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():129:141 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Q9:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -50970,7 +51353,7 @@
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):59:59 -> a
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():211 -> a
     45:50:com.android.tools.r8.graph.CfCode generateCfCode():213:218 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.R9:
     com.android.tools.r8.graph.DexField wrapperField -> e
     com.android.tools.r8.graph.DexType argType -> c
     boolean $assertionsDisabled -> f
@@ -50983,7 +51366,7 @@
     4:40:com.android.tools.r8.graph.CfCode generateCfCode():242:278 -> a
     41:41:com.android.tools.r8.graph.CfCode generateCfCode():276:276 -> a
     42:51:com.android.tools.r8.graph.CfCode generateCfCode():273:282 -> a
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.lb:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.mb:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -50995,7 +51378,7 @@
     6:48:com.android.tools.r8.graph.CfCode generateCfCode():62:104 -> a
     1:4:void addReturn(java.util.List):115:118 -> b
     1:2:void loadExtraParameters(java.util.List):109:110 -> c
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Lb:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Mb:
     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>
@@ -51004,7 +51387,7 @@
     4:4:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):54 -> a
     5:8:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):55:55 -> a
     12:12:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):59:59 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Jb:
     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
@@ -51014,7 +51397,7 @@
     3:3:com.android.tools.r8.graph.CfCode generateCfCode():94 -> a
     4:32:com.android.tools.r8.graph.CfCode generateCfCode():94:122 -> a
     33:40:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):102:109 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Kb:
     com.android.tools.r8.graph.DexType enumType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData):136:138 -> <init>
@@ -51025,7 +51408,7 @@
     46:46:com.android.tools.r8.graph.CfCode generateCfCode():194:194 -> a
     47:61:com.android.tools.r8.graph.CfCode generateCfCode():190:204 -> a
     62:71:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):175:184 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.Lb:
     com.android.tools.r8.graph.DexMethod initializationMethod -> f
     com.android.tools.r8.graph.DexField utilityField -> d
     boolean $assertionsDisabled -> g
@@ -51037,7 +51420,7 @@
     11:11:com.android.tools.r8.graph.CfCode generateCfCode():247 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():247:247 -> a
     13:18:com.android.tools.r8.graph.CfCode generateCfCode():245:250 -> a
-com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.bc:
     com.android.tools.r8.graph.DexType exceptionType -> m
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType):25:26 -> <init>
     1:1:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):31:31 -> f
@@ -51046,7 +51429,7 @@
     13:20:void com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode.build(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.graph.DexType):40:47 -> f
     13:20:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):31 -> f
     1:1:void prepareInstructions():31:31 -> i
-com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.pc:
+com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.qc:
     com.android.tools.r8.utils.OptionalBool isSetter -> c
     com.android.tools.r8.utils.OptionalBool isInstanceField -> b
     boolean $assertionsDisabled -> e
@@ -51087,7 +51470,7 @@
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder builder():35:35 -> b
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setGetter():50:50 -> c
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setSetter():61:61 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.md:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.nd:
     java.lang.Boolean isInterface -> g
     boolean isConstructorDelegate -> i
     boolean $assertionsDisabled -> k
@@ -51203,7 +51586,7 @@
     4:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setSuperTarget(com.android.tools.r8.graph.DexMethod,boolean):110:112 -> c
     1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticSource(com.android.tools.r8.graph.DexMethod):97:98 -> d
     3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):117:119 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.md:
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType VIRTUAL -> b
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType STATIC -> a
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType SPECIAL -> c
@@ -51211,7 +51594,7 @@
     1:3:void <clinit>():38:40 -> <clinit>
     4:4:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.od:
     com.android.tools.r8.graph.DexMethod target -> n
     boolean castResult -> p
     com.android.tools.r8.graph.DexType targetReceiver -> m
@@ -51228,7 +51611,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> i
     1:27:boolean checkSignatures():146:172 -> j
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.nd$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.od$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     com.android.tools.r8.graph.DexType targetReceiver -> d
     com.android.tools.r8.graph.DexMethod target -> e
@@ -51244,7 +51627,7 @@
     5:5:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode build(com.android.tools.r8.ir.code.Position):90:90 -> a
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):60:60 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):65:65 -> b
-com.android.tools.r8.ir.synthetic.RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.Qy:
+com.android.tools.r8.ir.synthetic.RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.rz:
     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[]):57:58 -> <init>
     1:2:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):45:46 -> a
@@ -51253,7 +51636,7 @@
     39:45:void lambda$generateCfCode$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):83:89 -> a
     46:46:void lambda$generateCfCode$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):87:87 -> a
     47:47:void lambda$generateCfCode$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):84:84 -> a
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.yE:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.aF:
     java.util.function.Consumer registryCallback -> d
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> c
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
@@ -51261,7 +51644,7 @@
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> P
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> Q
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.CE:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.eF:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType holder -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
@@ -51269,7 +51652,7 @@
     2:2:java.util.List com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider.defaultTryCatchs():46:46 -> a
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):33 -> a
     3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):34:34 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.IE:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.kF:
     int[] paramRegisters -> f
     java.util.function.Predicate doesNotEndBlock -> j
     java.util.function.Predicate endsBlock -> k
@@ -51325,19 +51708,19 @@
     1:1:void ensureFromTo(int,int,int):57:57 -> a
     2:2:void ensureFromTo(int,int,int):56:56 -> a
     3:3:void ensureFromTo(int,int,int):55:55 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.vd:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.Gd:
 # {"id":"sourceFile","fileName":"Function.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.pe:
     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.fe:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.Ae:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
     long mix(long) -> b
     1:1:int maxFill(int,float):205:205 -> b
     long nextPowerOfTwo(long) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.bD:
 com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.internal.h:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(boolean):68:68 -> a
@@ -51367,7 +51750,6 @@
     3:3:void add(java.lang.Object):34 -> add
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previousBoolean() -> k
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():56:56 -> previous
-    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():33 -> previous
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
     1:1:void set(java.lang.Object):34:34 -> set
@@ -51525,7 +51907,6 @@
     5:5:boolean equals(java.lang.Object):337:337 -> equals
     int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.remove(int) -> f
     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.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):0 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):41 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):0 -> get
     1:1:int hashCode():324:324 -> hashCode
@@ -51535,15 +51916,12 @@
     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
     2:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Integer,java.lang.Integer):135:138 -> put
-    2:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Integer,java.lang.Integer):0 -> put
     2:5:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:5:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
     1:13:void putAll(java.util.Map):83:95 -> putAll
     14:16:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Integer,java.lang.Integer):135:137 -> putAll
-    14:16:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Integer,java.lang.Integer):0 -> putAll
     14:16:void putAll(java.util.Map):95 -> putAll
     1:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.remove(java.lang.Object):153:156 -> remove
-    1:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.remove(java.lang.Object):0 -> remove
     1:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.remove(java.lang.Object):41 -> remove
     1:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.remove(java.lang.Object):0 -> remove
     1:1:java.lang.String toString():342:342 -> toString
@@ -51590,12 +51968,10 @@
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Integer,java.lang.Object):135:137 -> put
-    2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Integer,java.lang.Object):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Object,java.lang.Object):0 -> put
     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
-    14:16:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Integer,java.lang.Object):0 -> putAll
     14:16:void putAll(java.util.Map):82 -> putAll
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.remove(int) -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.remove(java.lang.Object):153:155 -> remove
@@ -51868,7 +52244,6 @@
     1:1:void set(int):46:46 -> b
     int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.previousInt() -> d
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.previous():56:56 -> previous
-    1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.previous():0 -> previous
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.previous():33 -> previous
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.previous():0 -> previous
     1:1:void set(java.lang.Object):34:34 -> set
@@ -51916,7 +52291,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet.tailSet(int):160:160 -> tailSet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet.tailSet(java.lang.Integer):68 -> tailSet
     3:3:java.util.SortedSet tailSet(java.lang.Object):22 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.Cg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.Xg:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -51953,8 +52328,8 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.values():321 -> values
     2:2:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.zg:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Bg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.Ug:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Wg:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1):133:133 -> <init>
@@ -51964,7 +52339,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.Ag:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Vg:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -51973,13 +52348,13 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.Dg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.Yg:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Eg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Zg:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Fg:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Og:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.ah:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.jh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> i
     int[] key -> b
     int[] value -> c
@@ -52040,14 +52415,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.Gg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.bh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:void clear():884:884 -> clear
     1:1:boolean contains(int):879:879 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     1:1:int size():874:874 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Hg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ch:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -52055,13 +52430,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.Ig:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.dh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     1:1:int nextInt():793:793 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator.next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Jg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.eh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803:803 -> <init>
@@ -52070,7 +52445,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:3:boolean remove(int):821:823 -> remove
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Kg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.fh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -52091,7 +52466,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.Lg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.gh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):689:689 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):689:689 -> <init>
@@ -52100,7 +52475,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.Mg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.hh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> f
     int last -> b
@@ -52118,16 +52493,16 @@
     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.Ng:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ih:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     1:1:int nextInt():854:854 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator.next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.Pg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.kh:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.Qg:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.Sg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.nh:
     java.lang.Object[] value -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet entries -> h
     int maxFill -> f
@@ -52189,14 +52564,14 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.mh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> a
     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.Sg$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.nh$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):600:600 -> <init>
@@ -52204,13 +52579,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.Sg$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.nh$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     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
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.Sg$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.nh$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> a
     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>
@@ -52219,7 +52594,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.Sg$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.nh$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):430:431 -> <init>
@@ -52231,7 +52606,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.Sg$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.nh$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> a
     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>
@@ -52240,7 +52615,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.Sg$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.nh$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> f
     int last -> b
@@ -52258,11 +52633,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.Sg$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.nh$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> g
     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.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Yg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.th:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry -> e
     boolean modified -> i
@@ -52451,14 +52826,14 @@
     209:212:java.lang.Object remove(int):494:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1384:1401 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.Tg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.oh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):102:102 -> <init>
     1:1:int compare(int,int):104:104 -> a
     1:1:int compare(java.lang.Object,java.lang.Object):102:102 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(java.lang.Integer,java.lang.Integer):108:108 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):102 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.Vg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.qh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -52481,20 +52856,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.Ug:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.ph:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2):1162:1162 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1162:1162 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1164:1164 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1162 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.Wg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.rh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1384:1384 -> <init>
     1:1:void clear():1398:1398 -> clear
     1:1:boolean contains(java.lang.Object):1390:1390 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1386:1386 -> iterator
     1:1:int size():1394:1394 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.Xg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.sh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> c
     int info -> e
@@ -52521,7 +52896,7 @@
     1:1:boolean succ():795:795 -> j
     1:2:java.lang.Object setValue(java.lang.Object):923:924 -> setValue
     1:1:java.lang.String toString():958:958 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Yg$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.th$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1131:1131 -> <init>
     1:1:void add(java.lang.Object):1130:1130 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1155:1155 -> add
@@ -52533,7 +52908,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.Yg$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.th$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1253:1253 -> <init>
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.add(java.lang.Integer):1301:1301 -> add
@@ -52547,12 +52922,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.Yg$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.th$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1308:1308 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1308:1308 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1311:1311 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Yg$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.th$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
@@ -52594,7 +52969,7 @@
     1:4:java.lang.Object remove(int):1657:1660 -> remove
     1:5:int size():1665:1669 -> size
     1:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1598:1618 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Zg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.uh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -52624,19 +52999,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.ah:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.vh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1598:1598 -> <init>
     1:1:void clear():1615:1615 -> clear
     1:1:boolean contains(java.lang.Object):1605:1605 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1600:1600 -> iterator
     1:1:int size():1610:1610 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Yg$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.th$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1580:1580 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1580:1580 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1582:1582 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Yg$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.th$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1808:1808 -> <init>
     1:1:void add(java.lang.Object):1807:1807 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1832:1832 -> add
@@ -52648,12 +53023,12 @@
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1827:1827 -> set
     2:2:void set(java.lang.Object):1807 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Yg$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.th$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:2:void updateNext():1802:1803 -> n
     1:2:void updatePrevious():1797:1798 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Yg$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.th$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1896:1896 -> add
@@ -52667,14 +53042,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.Yg$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.th$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1910:1910 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1910:1910 -> <init>
     1:1:void add(java.lang.Object):1928:1928 -> add
     1:1:java.lang.Object next():1913:1913 -> next
     1:1:java.lang.Object previous():1918:1918 -> previous
     1:1:void set(java.lang.Object):1923:1923 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Yg$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.th$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> c
@@ -52691,14 +53066,14 @@
     1:1:void updatePrevious():1076:1076 -> o
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Yg$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.th$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1348:1348 -> <init>
     1:1:void add(java.lang.Object):1366:1366 -> add
     1:1:java.lang.Object next():1351:1351 -> next
     1:1:java.lang.Object previous():1356:1356 -> previous
     1:1:void set(java.lang.Object):1361:1361 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.dh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.yh:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -52726,8 +53101,8 @@
     1:8:java.lang.Object remove(int):308:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.bh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.dh$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.yh$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1):133:133 -> <init>
@@ -52737,7 +53112,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.ch:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.xh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -52746,18 +53121,18 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.eh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.zh:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.fh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.Ah:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.fh$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.Ah$a:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.gh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.ih:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Bh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.Dh:
     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.hh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.Ch:
     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
@@ -52776,7 +53151,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.kh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.Fh:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> i
     java.lang.Object[] value -> c
@@ -52835,14 +53210,14 @@
     1:12:java.lang.Object remove(int):309:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.Eh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.kh$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Fh$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -52850,13 +53225,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.kh$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Fh$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.kh$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Fh$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -52865,7 +53240,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.kh$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Fh$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -52877,7 +53252,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.kh$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Fh$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -52886,7 +53261,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.kh$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.Fh$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -52904,11 +53279,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.kh$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Fh$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.qh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.Lh:
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry tree -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
@@ -53030,8 +53405,8 @@
     256:272:java.lang.Object remove(int):457:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.lh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.nh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Ih:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -53054,20 +53429,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.mh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.Hh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2):1128:1128 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1128:1128 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1130:1130 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1128 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.oh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.Jh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1348:1348 -> <init>
     1:1:void clear():1366:1366 -> clear
     1:1:boolean contains(java.lang.Object):1356:1356 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
     1:1:int size():1361:1361 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.ph:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.Kh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -53094,7 +53469,7 @@
     1:1:boolean succ():770:770 -> i
     1:2:java.lang.Object setValue(java.lang.Object):889:890 -> setValue
     1:1:java.lang.String toString():924:924 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.qh$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Lh$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1097:1097 -> <init>
     1:1:void add(java.lang.Object):1096:1096 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1121:1121 -> add
@@ -53106,7 +53481,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.qh$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Lh$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1219:1219 -> <init>
     1:1:void add(java.lang.Object):1218:1218 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -53120,12 +53495,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.qh$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.Lh$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1274:1274 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.qh$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Lh$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> i
@@ -53193,7 +53568,7 @@
     1:4:java.lang.Object remove(int):1622:1625 -> remove
     1:5:int size():1630:1634 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.rh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Mh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -53223,19 +53598,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.sh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.Nh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1566:1566 -> <init>
     1:1:void clear():1580:1580 -> clear
     1:1:boolean contains(java.lang.Object):1572:1572 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
     1:1:int size():1576:1576 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.qh$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Lh$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1548:1548 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.qh$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Lh$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1773:1773 -> <init>
     1:1:void add(java.lang.Object):1772:1772 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1797:1797 -> add
@@ -53247,7 +53622,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.qh$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Lh$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:2:void updateNext():1767:1768 -> n
@@ -53258,7 +53633,7 @@
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> o
     3:3:void updatePrevious():1763 -> o
     4:4:void updatePrevious():1763:1763 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.qh$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Lh$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1813:1813 -> <init>
     1:1:void add(java.lang.Object):1811:1811 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -53272,14 +53647,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.qh$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Lh$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1875:1875 -> <init>
     1:1:void add(java.lang.Object):1893:1893 -> add
     1:1:java.lang.Object next():1878:1878 -> next
     1:1:java.lang.Object previous():1883:1883 -> previous
     1:1:void set(java.lang.Object):1888:1888 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.qh$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Lh$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> c
@@ -53296,14 +53671,14 @@
     1:1:void updatePrevious():1042:1042 -> o
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.qh$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Lh$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1312:1312 -> <init>
     1:1:void add(java.lang.Object):1330:1330 -> add
     1:1:java.lang.Object next():1315:1315 -> next
     1:1:java.lang.Object previous():1320:1320 -> previous
     1:1:void set(java.lang.Object):1325:1325 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.th:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.Oh:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> 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
@@ -53313,10 +53688,10 @@
     int firstIntKey() -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
     int lastIntKey() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.vh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.Qh:
     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.uh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.Ph:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():57:57 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> a
@@ -53341,7 +53716,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.xh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.Sh:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -53383,7 +53758,7 @@
     6:6:void grow(int):250:250 -> m
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.Rh:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -53397,7 +53772,7 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.zh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.Uh:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -53420,25 +53795,25 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:6:boolean remove(int):153:158 -> remove
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.yh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.Th:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:int nextInt():129:129 -> j
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Ah:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Vh:
     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.Bh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.Wh:
     int previousInt() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Dh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Yh:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection) -> a
     boolean contains(int) -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.bi:
     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.Eh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.Zh:
     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
@@ -53449,7 +53824,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.Fh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.ai:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -53473,23 +53848,23 @@
     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.Hh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.ci:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.ei:
     int nextInt() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.Mh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.hi:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Kh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.fi:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.gi:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):807:808 -> <init>
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.Nh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.ii:
     boolean add(int) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
@@ -53497,8 +53872,8 @@
     int set(int,int) -> c
     int removeInt(int) -> e
     int getInt(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.Oh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.ji:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.ri:
     float f -> g
     int size -> f
     int n -> d
@@ -53551,8 +53926,8 @@
     2:5:boolean remove(int):365 -> remove
     6:13:boolean remove(int):369:376 -> remove
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.Uh:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Vh:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.pi:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.qi:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> f
     int last -> b
@@ -53570,21 +53945,21 @@
     14:22:void remove():532 -> remove
     23:24:void remove():535:536 -> remove
     25:25:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.bi:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.di:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.wi:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.yi:
     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.ci:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.xi:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean rem(int):64:64 -> g
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.ei:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.gi:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.zi:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Bi:
     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.fi:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.Ai:
     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
@@ -53600,7 +53975,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):39:39 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.tailSet(java.lang.Integer):128:128 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):39 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.hi:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.Ci:
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.internal.N:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -53622,7 +53997,6 @@
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Long,java.lang.Object):135:137 -> put
-    2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Long,java.lang.Object):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):0 -> put
     1:7:void putAll(java.util.Map):70:76 -> putAll
@@ -53630,7 +54004,6 @@
     8:8:void putAll(java.util.Map):76 -> putAll
     9:15:void putAll(java.util.Map):76:82 -> putAll
     16:18:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Long,java.lang.Object):135:137 -> putAll
-    16:18:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Long,java.lang.Object):0 -> putAll
     16:18:void putAll(java.util.Map):82 -> putAll
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.remove(java.lang.Object):153:155 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.remove(java.lang.Object):0 -> remove
@@ -53647,7 +54020,6 @@
     long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.nextLong() -> a
     long previousLong() -> b
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():57:57 -> next
-    1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():0 -> next
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():33 -> next
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():0 -> next
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongBidirectionalIterator.previous():56:56 -> previous
@@ -53683,9 +54055,7 @@
     12:12:int compareTo(java.util.List):476 -> a
     13:15:int compareTo(java.util.List):476:478 -> a
     16:16:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():57:57 -> a
-    16:16:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():0 -> a
     16:16:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():33 -> a
-    16:16:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():0 -> a
     16:16:int compareTo(java.util.List):479 -> a
     17:19:int compareTo(java.util.List):479:481 -> a
     1:1:void add(int,java.lang.Object):32:32 -> add
@@ -53717,9 +54087,7 @@
     10:10:boolean equals(java.lang.Object):441 -> equals
     11:11:boolean equals(java.lang.Object):441:441 -> equals
     12:12:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():57:57 -> equals
-    12:12:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():0 -> equals
     12:12:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():33 -> equals
-    12:12:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():0 -> equals
     12:12:boolean equals(java.lang.Object):443 -> equals
     13:13:boolean equals(java.lang.Object):443:443 -> equals
     14:14:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.valEquals(java.lang.Object,java.lang.Object):407:407 -> equals
@@ -53840,9 +54208,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.xp:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.yp:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.Ap:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.Up:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Vp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.Xp:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> j
     java.lang.Object[] value -> b
     long[] key -> a
@@ -53899,14 +54267,14 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.zp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.Wp:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ap$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Xp$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -53914,13 +54282,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.Ap$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Xp$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:long nextLong():727:727 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Ap$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Xp$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -53928,7 +54296,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.Ap$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Xp$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -53939,7 +54307,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.Ap$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Xp$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -53948,7 +54316,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.Ap$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.Xp$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> e
     int last -> b
@@ -53966,11 +54334,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.Ap$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Xp$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.Cp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.Zp:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -53996,7 +54364,7 @@
     1:2:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.Bp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.Yp:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -54010,18 +54378,18 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.Dp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.aq:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.Ep:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.Gp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.bq:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.dq:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.Hp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.eq:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long getLong(int) -> b
     long set(int,long) -> b
     long removeLong(int) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.Lp:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.iq:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.k0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -54036,7 +54404,6 @@
     4:4:boolean equals(java.lang.Object):323 -> equals
     5:5:boolean equals(java.lang.Object):323:323 -> equals
     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.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.get(java.lang.Object):0 -> 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
     1:1:int hashCode():310:310 -> hashCode
@@ -54049,7 +54416,6 @@
     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
     2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:125 -> put
-    2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
     1:7:void putAll(java.util.Map):82:88 -> putAll
@@ -54059,10 +54425,8 @@
     9:9:void putAll(java.util.Map):88 -> putAll
     10:16:void putAll(java.util.Map):88:94 -> putAll
     17:18:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:124 -> putAll
-    17:18:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):0 -> putAll
     17:18:void putAll(java.util.Map):94 -> putAll
     1:3:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.remove(java.lang.Object):140:142 -> remove
-    1:3:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.remove(java.lang.Object):0 -> remove
     1:1:java.lang.String toString():328:328 -> toString
@@ -54112,7 +54476,6 @@
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):320:323 -> equals
     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.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):0 -> get
     1:4:int hashCode():310:313 -> hashCode
@@ -54120,15 +54483,12 @@
     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
     2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Integer):123:125 -> put
-    2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Integer):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
     1:13:void putAll(java.util.Map):82:94 -> putAll
     14:15:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Integer):123:124 -> putAll
-    14:15:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Integer):0 -> putAll
     14:15:void putAll(java.util.Map):94 -> putAll
     1:3:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):140:142 -> remove
-    1:3:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):0 -> remove
     1:17:java.lang.String toString():328:344 -> toString
@@ -54180,30 +54540,24 @@
     4:4:boolean equals(java.lang.Object):322 -> equals
     5:5:boolean equals(java.lang.Object):323:323 -> equals
     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.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> 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
     2:12:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.getLong(java.lang.Object):371:381 -> get
     2:12:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):108 -> get
-    2:12:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     2:12:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
     2:12:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     13:13:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):108:108 -> get
-    13:13:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
-    2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Long):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     1:13:void putAll(java.util.Map):82:94 -> putAll
     14:15:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Long):123:124 -> putAll
-    14:15:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Long):0 -> putAll
     14:15:void putAll(java.util.Map):94 -> putAll
     1:3:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.remove(java.lang.Object):140:142 -> remove
-    1:3:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.String toString():328:330 -> toString
@@ -54475,7 +54829,6 @@
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):320:323 -> equals
     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.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):0 -> get
     1:4:int hashCode():310:313 -> hashCode
@@ -54483,15 +54836,12 @@
     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
     2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Integer):123:125 -> put
-    2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Integer):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
     1:13:void putAll(java.util.Map):82:94 -> putAll
     14:15:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Integer):123:124 -> putAll
-    14:15:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Integer):0 -> putAll
     14:15:void putAll(java.util.Map):94 -> putAll
     1:3:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):140:142 -> remove
-    1:3:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):0 -> remove
     1:17:java.lang.String toString():328:344 -> toString
@@ -54541,13 +54891,11 @@
     4:4:boolean equals(java.lang.Object):322 -> equals
     5:5:boolean equals(java.lang.Object):323:323 -> equals
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):108:108 -> get
-    1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
-    2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):41 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     1:7:void putAll(java.util.Map):82:88 -> putAll
@@ -54555,10 +54903,8 @@
     8:8:void putAll(java.util.Map):88 -> putAll
     9:15:void putAll(java.util.Map):88:94 -> putAll
     16:17:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):123:124 -> putAll
-    16:17:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):0 -> putAll
     16:17:void putAll(java.util.Map):94 -> putAll
     1:3:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):140:142 -> remove
-    1:3:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.remove(java.lang.Object):0 -> remove
     1:3:java.lang.String toString():328:330 -> toString
@@ -54665,7 +55011,7 @@
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.O0:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.vt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.Pt:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
@@ -54694,8 +55040,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.tt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.vt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.Nt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.Pt$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1):133:133 -> <init>
@@ -54705,7 +55051,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.ut:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Ot:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -54714,9 +55060,9 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.internal.wt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.wt$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.zt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.internal.Qt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.Qt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.Tt:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -54746,8 +55092,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.xt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.zt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.Rt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Tt$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1):133:133 -> <init>
@@ -54757,7 +55103,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.yt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.St:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -54766,10 +55112,10 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.At:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.Ut:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Ct:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Wt:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -54842,14 +55188,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.Bt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Vt:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ct$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Wt$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -54864,14 +55210,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.Ct$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Wt$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Ct$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Wt$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -54891,7 +55237,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.Ct$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Wt$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -54910,7 +55256,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.Ct$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Wt$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -54932,7 +55278,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.Ct$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Wt$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -54950,7 +55296,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.Ct$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Wt$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -54965,11 +55311,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.Ft:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.Zt:
     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.Dt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.Et:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.Ht:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.Xt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.Yt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.bu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
     int[] value -> c
@@ -54983,6 +55329,7 @@
     1:9:void <init>(int,float):91:99 -> <init>
     10:10:void <init>(int,float):93:93 -> <init>
     11:11:void <init>(int,float):92:92 -> <init>
+    12:12:void <init>():119:119 -> <init>
     1:1:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):49:49 -> a
     2:2:int access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):49:49 -> a
     3:18:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> a
@@ -55027,14 +55374,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.Gt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.au:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ht$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.bu$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -55042,11 +55389,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.Ht$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.bu$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Ht$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.bu$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):785:785 -> <init>
@@ -55055,7 +55402,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.Ht$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.bu$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -55074,7 +55421,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.Ht$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.bu$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):679:679 -> <init>
@@ -55083,7 +55430,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.Ht$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.bu$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     int last -> b
@@ -55101,17 +55448,17 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Ht$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.bu$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.It:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.Jt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.Jt$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.Kt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.Mt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.cu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.du:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.du$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.eu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.gu:
     java.lang.Object[] key -> a
     long[] value -> b
     int maxFill -> f
@@ -55170,14 +55517,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.Lt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.fu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Mt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.gu$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -55185,11 +55532,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.Mt$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.gu$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Mt$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.gu$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):785:785 -> <init>
@@ -55198,7 +55545,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.Mt$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.gu$d:
     int index -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -55217,7 +55564,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.Mt$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.gu$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):679:679 -> <init>
@@ -55226,7 +55573,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.Mt$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.gu$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> f
     int last -> b
@@ -55244,13 +55591,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.Mt$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.gu$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.Ot:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.iu:
     java.lang.Object[] value -> b
     int maxFill -> j
     java.lang.Object[] key -> a
@@ -55320,14 +55667,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.Nt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.hu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1529:1529 -> <init>
     1:1:void clear():1547:1547 -> clear
     1:1:boolean contains(java.lang.Object):1542:1542 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.Ot$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.iu$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -55342,14 +55689,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.Ot$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.iu$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1412:1413 -> <init>
     1:1:void add(java.lang.Object):1409:1409 -> add
     1:1:java.lang.Object next():1418:1418 -> next
     1:1:java.lang.Object previous():1399:1399 -> previous
     1:1:void set(java.lang.Object):1404:1404 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.Ot$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.iu$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1422:1422 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1422:1422 -> <init>
@@ -55369,7 +55716,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.Ot$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.iu$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -55379,7 +55726,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.Ot$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.iu$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1228:1228 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1228:1228 -> <init>
@@ -55401,7 +55748,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.Ot$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.iu$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -55419,17 +55766,17 @@
     1:2:int previousIndex():1079:1080 -> previousIndex
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.Ot$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.iu$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1517:1518 -> <init>
     1:1:void add(java.lang.Object):1514:1514 -> add
     1:1:java.lang.Object next():1523:1523 -> next
     1:1:java.lang.Object previous():1504:1504 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.Qt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.Pt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Rt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Tt:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.ku:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.lu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.nu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> l
     java.lang.Object[] value -> b
     int size -> j
@@ -55499,14 +55846,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:1:java.util.Collection values():85:85 -> values
     2:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1498:1519 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.St:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.mu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1498:1498 -> <init>
     1:1:void clear():1516:1516 -> clear
     1:1:boolean contains(java.lang.Object):1511:1511 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1501:1501 -> iterator
     1:1:int size():1506:1506 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Tt$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.nu$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -55521,14 +55868,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.Tt$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.nu$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1381:1382 -> <init>
     1:1:void add(java.lang.Object):1378:1378 -> add
     1:1:java.lang.Object next():1387:1387 -> next
     1:1:java.lang.Object previous():1368:1368 -> previous
     1:1:void set(java.lang.Object):1373:1373 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Tt$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.nu$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1391:1391 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1391:1391 -> <init>
@@ -55548,7 +55895,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.Tt$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.nu$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -55558,7 +55905,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.Tt$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.nu$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1197:1197 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1197:1197 -> <init>
@@ -55580,7 +55927,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.Tt$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.nu$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -55598,17 +55945,17 @@
     1:2:int previousIndex():1048:1049 -> previousIndex
     1:49:void remove():1071:1119 -> remove
     50:50:void remove():1072:1072 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Tt$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.nu$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1486:1487 -> <init>
     1:1:void add(java.lang.Object):1483:1483 -> add
     1:1:java.lang.Object next():1492:1492 -> next
     1:1:java.lang.Object previous():1473:1473 -> previous
     1:1:void set(java.lang.Object):1478:1478 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.Vt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.Ut:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Wt:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.cu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.pu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.ou:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.qu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.wu:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -55631,7 +55978,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.bu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.vu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -55645,7 +55992,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.eu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.yu:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):29:29 -> a
@@ -55665,20 +56012,20 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.du:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.xu:
     int next -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.fu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.zu:
 # {"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.hu:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.iu:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.Bu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.Du:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -55687,16 +56034,16 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.ku:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.ou:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.Eu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.Iu:
     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.lu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.Fu:
     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.mu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.Gu:
     java.lang.Object element -> a
     int curr -> b
     1:2:void <init>(java.lang.Object):127:128 -> <init>
@@ -55706,24 +56053,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.nu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Hu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):739:740 -> <init>
     1:1:boolean hasNext():745:745 -> hasNext
     1:1:java.lang.Object next():750:750 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.pu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.Ju:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.qu:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.su:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.vu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.Ku:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.Mu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.Pu:
     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.tu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.Nu:
     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.uu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.Ou:
     java.lang.Object element -> a
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -55741,11 +56088,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.wu:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.yu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.Qu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.Su:
     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.xu:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.Ru:
     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
@@ -55756,18 +56103,18 @@
     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.az:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.Bz:
     boolean put(java.lang.Object,boolean) -> a
     boolean getBoolean(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.bz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.Cz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.bz$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.cz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.fz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Cz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Dz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.Gz:
     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.dz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.Ez:
     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
@@ -55787,7 +56134,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.ez:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.Fz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entries -> c
@@ -55828,7 +56175,7 @@
     1:1:java.lang.String toString():240:240 -> toString
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.values():215:216 -> values
     1:2:java.util.Collection values():157 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.hz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.Iz:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
@@ -55889,14 +56236,14 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.gz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.Hz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):803:803 -> <init>
     1:1:boolean contains(boolean):816:816 -> b
     1:1:void clear():821:821 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.hz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Iz$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -55904,11 +56251,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.hz$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Iz$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):730:731 -> <init>
     1:1:java.lang.Object next():736:736 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.hz$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.Iz$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):740:740 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):740:740 -> <init>
@@ -55917,7 +56264,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.hz$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.Iz$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -55936,7 +56283,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.hz$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Iz$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):634:634 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):634:634 -> <init>
@@ -55945,7 +56292,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.hz$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.Iz$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -55963,13 +56310,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.hz$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Iz$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:boolean nextBoolean():791:791 -> 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.kz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.Lz:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -55997,8 +56344,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.iz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.kz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Lz$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1):133:133 -> <init>
@@ -56008,7 +56355,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.jz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Kz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -56017,11 +56364,11 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.lz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.Mz:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
     int removeInt(java.lang.Object) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.nz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Oz:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -56093,14 +56440,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.mz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Nz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.nz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Oz$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -56115,14 +56462,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.nz$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Oz$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.nz$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Oz$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -56142,7 +56489,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.nz$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Oz$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -56161,7 +56508,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.nz$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Oz$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -56183,7 +56530,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.nz$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Oz$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -56201,7 +56548,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.nz$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Oz$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -56216,11 +56563,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.oz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.Pz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.oz$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.pz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.rz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.Pz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.Sz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> i
     java.lang.Object[] key -> b
     int[] value -> c
@@ -56280,14 +56627,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.qz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.Rz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.rz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Sz$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -56295,11 +56642,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.rz$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Sz$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.rz$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Sz$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):785:785 -> <init>
@@ -56308,7 +56655,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.rz$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Sz$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -56327,7 +56674,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.rz$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Sz$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):679:679 -> <init>
@@ -56336,7 +56683,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.rz$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Sz$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -56354,16 +56701,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.rz$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Sz$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.sz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.tz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.uz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.wz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.Vz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.Xz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> h
@@ -56420,14 +56767,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.vz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.Wz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.wz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Xz$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -56435,11 +56782,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.wz$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Xz$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.wz$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Xz$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):785:785 -> <init>
@@ -56448,7 +56795,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.wz$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Xz$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -56466,7 +56813,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.wz$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Xz$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):679:679 -> <init>
@@ -56475,7 +56822,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.wz$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Xz$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -56493,13 +56840,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.wz$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Xz$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.Zz:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -56522,7 +56869,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.xz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.Yz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -56536,7 +56883,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.Az:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.bA:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):29:29 -> a
@@ -56556,17 +56903,17 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.zz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.aA:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.Bz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.Ez:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.cA:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.fA:
     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.Cz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.dA:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -56574,7 +56921,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.Dz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.eA:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -56596,9 +56943,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.Fz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.gA:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.Hz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.iA:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -56645,8 +56992,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.Gz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.Hz$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.hA:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.iA$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -56664,16 +57011,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.Iz:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.Lz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.mA:
     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.Jz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.kA:
     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.Kz:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.lA:
     java.lang.Object element -> a
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -56691,8 +57038,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.Mz:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.K3:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.nA:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.J3:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> j
@@ -56740,7 +57087,7 @@
     150:150: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):245:245 -> a
     151:151:void lambda$writeClass$3(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):263:263 -> a
     152:155:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):267:270 -> a
-    156:156:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    156:156:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     156:156:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
     157:160:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):270:273 -> a
     161:169:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):272:280 -> a
@@ -56778,32 +57125,29 @@
     339:342:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):478:481 -> a
     343:347:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):480:484 -> a
     1:22:void writeApplication(com.android.tools.r8.ClassFileConsumer):120:141 -> b
-    23:23:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> b
+    23:23:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> b
     23:23:void writeApplication(com.android.tools.r8.ClassFileConsumer):145 -> b
     24:26:void writeApplication(com.android.tools.r8.ClassFileConsumer):147:149 -> b
     27:31:void writeApplication(com.android.tools.r8.ClassFileConsumer):146:150 -> b
     32:32:void writeApplication(com.android.tools.r8.ClassFileConsumer):143:143 -> b
     33:34:void writeApplication(com.android.tools.r8.ClassFileConsumer):131:132 -> b
-    35:35:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> b
+    35:35:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> b
     35:35:void writeApplication(com.android.tools.r8.ClassFileConsumer):136 -> b
     36:37:void writeApplication(com.android.tools.r8.ClassFileConsumer):137:138 -> b
     38:57:void writeApplication(com.android.tools.r8.ClassFileConsumer):134:153 -> b
     58:58:void lambda$writeClass$2(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):248:248 -> b
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.J3:
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.I3:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.I9:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.J9:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel[] $VALUES -> d
-    1:1:void <init>(java.lang.String,int):63:63 -> <init>
-com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.internal.Bn:
-# {"id":"sourceFile","fileName":"KotlinNullPointerException.kt"}
-    1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.po:
+    1:1:void <init>(java.lang.String,int):84:84 -> <init>
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.Mo:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.uo:
+com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.Ro:
     1:22:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:21 -> a
     1:22:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
     23:23:void com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.<init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55:55 -> a
@@ -56818,17 +57162,17 @@
     64:64:void com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.<init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55:55 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):35 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
-com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.internal.So:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.wo:
+com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.To:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode PUBLICATION -> a
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode[] $VALUES -> b
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.Ns:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.ht:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.kv:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.Ev:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -56838,7 +57182,7 @@
     1:1:java.lang.Object getFirst():27:27 -> c
     1:1:java.lang.Object getSecond():28:28 -> d
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.internal.mB:
+com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.internal.NB:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     java.util.concurrent.atomic.AtomicReferenceFieldUpdater valueUpdater -> c
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
@@ -56849,368 +57193,347 @@
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl.isInitialized():117:117 -> toString
     1:1:java.lang.String toString():119 -> toString
     2:2:java.lang.String toString():119:119 -> toString
-com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.xE:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.ZE:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
     java.lang.Object lock -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object):55:59 -> <init>
     1:14:java.lang.Object getValue():63:76 -> getValue
-    15:21:java.lang.Object getValue():69:69 -> getValue
+    15:15:java.lang.Object getValue():69:69 -> getValue
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
-com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.internal.vF:
-# {"id":"sourceFile","fileName":"TypeCastException.kt"}
-    1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.JF:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.jG:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.QF:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.qG:
 # {"id":"sourceFile","fileName":"UninitializedPropertyAccessException.kt"}
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.UF:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.uG:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.fG:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.FG:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):74:76 -> <init>
-    1:3:java.lang.Object getValue():80:82 -> getValue
-    4:8:java.lang.Object getValue():81:85 -> getValue
+    1:6:java.lang.Object getValue():80:85 -> getValue
     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.bI:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.zI:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.internal.m:
 # {"id":"sourceFile","fileName":"AbstractCollection.kt"}
-    1:1:void <init>():13:13 -> <init>
+    1:1:void <init>():15:15 -> <init>
     int getSize() -> a
-    1:2:boolean contains(java.lang.Object):40:41 -> contains
-    3:3:boolean contains(java.lang.Object):17:17 -> contains
-    1:2:boolean containsAll(java.util.Collection):43:44 -> containsAll
-    3:3:boolean containsAll(java.util.Collection):20:20 -> containsAll
-    1:1:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():13:13 -> isEmpty
-    1:1:boolean isEmpty():22 -> isEmpty
-    1:1:int size():13:13 -> size
-    1:1:java.lang.Object[] toArray():31:31 -> toArray
-    2:2:java.lang.Object[] toArray(java.lang.Object[]):37:37 -> toArray
-    1:1:java.lang.String toString():24:24 -> toString
+    1:2:boolean contains(java.lang.Object):43:44 -> contains
+    3:3:boolean contains(java.lang.Object):19:19 -> contains
+    1:2:boolean containsAll(java.util.Collection):46:47 -> containsAll
+    3:3:boolean containsAll(java.util.Collection):22:22 -> containsAll
+    1:1:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():15:15 -> isEmpty
+    1:1:boolean isEmpty():24 -> isEmpty
+    1:1:int size():15:15 -> size
+    1:1:java.lang.Object[] toArray():34:34 -> toArray
+    2:2:java.lang.Object[] toArray(java.lang.Object[]):40:40 -> toArray
+    1:1:java.lang.String toString():26:26 -> toString
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.internal.l:
 # {"id":"sourceFile","fileName":"AbstractCollection.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection this$0 -> a
-    1:1:java.lang.CharSequence com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1.invoke(java.lang.Object):25:25 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):13 -> a
+    1:1:java.lang.CharSequence com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1.invoke(java.lang.Object):27:27 -> a
+    1:1:java.lang.Object invoke(java.lang.Object):15 -> a
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.internal.K:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion Companion -> a
-    1:1:void <init>():20:20 -> <init>
-    1:3:boolean equals(java.lang.Object):60:62 -> equals
-    4:144:boolean com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.orderedEquals$kotlin_stdlib(java.util.Collection,java.util.Collection):0:140 -> equals
-    4:144:boolean equals(java.lang.Object):62 -> equals
-    1:130:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.orderedHashCode$kotlin_stdlib(java.util.Collection):0:129 -> hashCode
-    1:130:int hashCode():68 -> hashCode
-    1:1:int indexOf(java.lang.Object):149:149 -> indexOf
-    2:2:int indexOf(java.lang.Object):26:26 -> indexOf
-    1:1:java.util.Iterator iterator():24:24 -> iterator
-    1:3:int lastIndexOf(java.lang.Object):155:157 -> lastIndexOf
-    4:134:int lastIndexOf(java.lang.Object):28:158 -> lastIndexOf
-    1:1:java.util.ListIterator listIterator():30:30 -> listIterator
-    2:2:java.util.ListIterator listIterator(int):32:32 -> listIterator
-    1:1:java.util.List subList(int,int):34:34 -> subList
+    1:1:void <init>():21:21 -> <init>
+    1:3:boolean equals(java.lang.Object):61:63 -> equals
+    4:154:boolean com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.orderedEquals$kotlin_stdlib(java.util.Collection,java.util.Collection):0:150 -> equals
+    4:154:boolean equals(java.lang.Object):63 -> equals
+    1:140:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.orderedHashCode$kotlin_stdlib(java.util.Collection):0:139 -> hashCode
+    1:140:int hashCode():69 -> hashCode
+    1:1:int indexOf(java.lang.Object):159:159 -> indexOf
+    2:2:int indexOf(java.lang.Object):27:27 -> indexOf
+    1:1:java.util.Iterator iterator():25:25 -> iterator
+    1:3:int lastIndexOf(java.lang.Object):165:167 -> lastIndexOf
+    4:143:int lastIndexOf(java.lang.Object):29:168 -> lastIndexOf
+    1:1:java.util.ListIterator listIterator():31:31 -> listIterator
+    2:2:java.util.ListIterator listIterator(int):33:33 -> listIterator
+    1:1:java.util.List subList(int,int):35:35 -> subList
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion -> com.android.tools.r8.internal.J:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
-    1:1:void <init>():104:104 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):104:104 -> <init>
-    1:1:void checkPositionIndex$kotlin_stdlib(int,int):113:113 -> a
-    2:2:void checkRangeIndexes$kotlin_stdlib(int,int,int):122:122 -> a
-    3:3:void checkRangeIndexes$kotlin_stdlib(int,int,int):119:119 -> a
+    1:1:void <init>():105:105 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):105:105 -> <init>
+    1:1:void checkPositionIndex$kotlin_stdlib(int,int):114:114 -> a
+    2:2:void checkRangeIndexes$kotlin_stdlib(int,int,int):123:123 -> a
+    3:3:void checkRangeIndexes$kotlin_stdlib(int,int,int):120:120 -> a
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$IteratorImpl -> com.android.tools.r8.internal.K$a:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> b
     int index -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):70:70 -> <init>
-    1:1:void setIndex(int):72:72 -> a
-    1:1:boolean hasNext():74:74 -> hasNext
-    2:2:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():13:13 -> hasNext
-    2:2:boolean hasNext():74 -> hasNext
-    1:1:int getIndex():72:72 -> k
-    1:3:java.lang.Object next():77:77 -> next
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):71:71 -> <init>
+    1:1:void setIndex(int):73:73 -> a
+    1:1:boolean hasNext():75:75 -> hasNext
+    2:2:int com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection.size():15:15 -> hasNext
+    2:2:boolean hasNext():75 -> hasNext
+    1:1:int getIndex():73:73 -> k
+    1:3:java.lang.Object next():78:78 -> next
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.internal.K$b:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> c
-    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int):85:89 -> <init>
-    1:1:boolean hasPrevious():92:92 -> hasPrevious
-    1:1:int nextIndex():94:94 -> nextIndex
-    1:3:java.lang.Object previous():97:97 -> previous
-    1:1:int previousIndex():101:101 -> previousIndex
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int):86:90 -> <init>
+    1:1:boolean hasPrevious():93:93 -> hasPrevious
+    1:1:int nextIndex():95:95 -> nextIndex
+    1:3:java.lang.Object previous():98:98 -> previous
+    1:1:int previousIndex():102:102 -> previousIndex
 com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.android.tools.r8.internal.L:
 # {"id":"sourceFile","fileName":"AbstractList.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList list -> c
     int fromIndex -> d
     int _size -> b
-    1:6:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int,int):36:41 -> <init>
-    1:1:int getSize():50:50 -> a
-    1:3:java.lang.Object get(int):45:47 -> get
-    4:4:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkElementIndex$kotlin_stdlib(int,int):107:107 -> get
-    4:4:java.lang.Object get(int):45 -> get
+    1:6:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int,int):37:42 -> <init>
+    1:1:int getSize():51:51 -> a
+    1:3:java.lang.Object get(int):46:48 -> get
+    4:4:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkElementIndex$kotlin_stdlib(int,int):108:108 -> get
+    4:4:java.lang.Object get(int):46 -> get
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.E1:
-    1:163:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:162 -> a
-    1:163:java.util.List asList(int[]):0 -> a
-    164:164:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):0:0 -> a
-    164:164:java.util.List asList(java.lang.Object[]):0 -> a
-    165:165:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysUtilJVM.asList(java.lang.Object[]):13:13 -> a
-    165:165:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):127 -> a
-    165:165:java.util.List asList(java.lang.Object[]):0 -> a
-    166:166:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):127:127 -> a
-    166:166:java.util.List asList(java.lang.Object[]):0 -> a
+    1:169:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:168 -> a
+    1:169:java.util.List asList(int[]):0 -> a
+    170:170:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):0:0 -> a
+    170:170:java.util.List asList(java.lang.Object[]):0 -> a
+    171:171:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysUtilJVM.asList(java.lang.Object[]):13:13 -> a
+    171:171:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):133 -> a
+    171:171:java.util.List asList(java.lang.Object[]):0 -> a
+    172:172:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):133:133 -> a
+    172:172:java.util.List asList(java.lang.Object[]):0 -> a
+    173:2946:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):0:2773 -> a
+    173:2946:char single(char[]):0 -> a
+    2947:2947:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):2771:2771 -> a
+    2947:2947:char single(char[]):0 -> a
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):0:0 -> b
     1:1:java.lang.Integer getOrNull(int[],int):0 -> b
-    2:6561:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getLastIndex(int[]):0:6559 -> b
-    2:6561:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1231 -> b
-    2:6561:java.lang.Integer getOrNull(int[],int):0 -> b
-    6562:6562:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1231:1231 -> b
-    6562:6562:java.lang.Integer getOrNull(int[],int):0 -> b
+    2:7947:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getLastIndex(int[]):0:7945 -> b
+    2:7947:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1418 -> b
+    2:7947:java.lang.Integer getOrNull(int[],int):0 -> b
+    7948:7948:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getOrNull(int[],int):1418:1418 -> b
+    7948:7948:java.lang.Integer getOrNull(int[],int):0 -> b
+    7949:17800:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):0:9851 -> b
+    7949:17800:java.util.List toList(int[]):0 -> b
+    17801:27744:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toMutableList(int[]):0:9943 -> b
+    17801:27744:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):9854 -> b
+    17801:27744:java.util.List toList(int[]):0 -> b
+    27745:27745:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):9853:9853 -> b
+    27745:27745:java.util.List toList(int[]):0 -> b
+    27746:27746:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):9852:9852 -> b
+    27746:27746:java.util.List toList(int[]):0 -> b
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.F1:
 # {"id":"sourceFile","fileName":"Arrays.kt"}
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.G1:
 # {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
     int[] $this_asList -> b
-    1:1:void <init>(int[]):162:162 -> <init>
-    1:1:int getSize():163:163 -> a
-    1:1:boolean contains(java.lang.Object):162:162 -> contains
-    1:1:boolean contains(int):165:165 -> d
-    2:405:boolean com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.contains(int[],int):0:403 -> d
-    2:405:boolean contains(int):165 -> d
-    1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.get(int):166:166 -> get
-    1:1:java.lang.Object get(int):162 -> get
-    1:1:int indexOf(java.lang.Object):162:162 -> indexOf
-    2:2:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.indexOf(int):167:167 -> indexOf
-    2:2:int indexOf(java.lang.Object):162 -> indexOf
-    1:1:boolean isEmpty():164:164 -> isEmpty
-    1:1:int lastIndexOf(java.lang.Object):162:162 -> lastIndexOf
-    2:2:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168:168 -> lastIndexOf
-    2:2:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-    3:3:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):0:0 -> lastIndexOf
-    3:3:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
-    3:3:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-    4:6365:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getIndices(int[]):0:6361 -> lastIndexOf
-    4:6365:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847 -> lastIndexOf
-    4:6365:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
-    4:6365:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-    6366:12925:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getLastIndex(int[]):0:6559 -> lastIndexOf
-    6366:12925:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getIndices(int[]):6361 -> lastIndexOf
-    6366:12925:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847 -> lastIndexOf
-    6366:12925:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
-    6366:12925:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-    12926:12926:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.getIndices(int[]):6361:6361 -> lastIndexOf
-    12926:12926:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847 -> lastIndexOf
-    12926:12926:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
-    12926:12926:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-    12927:13792:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.reversed(java.lang.Iterable):0:865 -> lastIndexOf
-    12927:13792:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847 -> lastIndexOf
-    12927:13792:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
-    12927:13792:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-    13793:13830:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsJvmKt.reverse(java.util.List):0:37 -> lastIndexOf
-    13793:13830:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.reversed(java.lang.Iterable):866 -> lastIndexOf
-    13793:13830:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847 -> lastIndexOf
-    13793:13830:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
-    13793:13830:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-    13831:13832:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847:1848 -> lastIndexOf
-    13831:13832:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):168 -> lastIndexOf
-    13831:13832:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
+    1:1:void <init>(int[]):168:168 -> <init>
+    1:1:int getSize():169:169 -> a
+    1:1:boolean contains(java.lang.Object):168:168 -> contains
+    1:1:boolean contains(int):171:171 -> d
+    2:542:boolean com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.contains(int[],int):0:540 -> d
+    2:542:boolean contains(int):171 -> d
+    1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.get(int):172:172 -> get
+    1:1:java.lang.Object get(int):168 -> get
+    1:1:int indexOf(java.lang.Object):168:168 -> indexOf
+    2:2:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.indexOf(int):173:173 -> indexOf
+    2:2:int indexOf(java.lang.Object):168 -> indexOf
+    1:1:boolean isEmpty():170:170 -> isEmpty
+    1:1:int lastIndexOf(java.lang.Object):168:168 -> lastIndexOf
+    2:2:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):174:174 -> lastIndexOf
+    2:2:int lastIndexOf(java.lang.Object):168 -> lastIndexOf
+    3:2052:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):0:2049 -> lastIndexOf
+    3:2052:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):174 -> lastIndexOf
+    3:2052:int lastIndexOf(java.lang.Object):168 -> lastIndexOf
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.H1:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
-    1:2:int indexOf(int[],int):1317:1318 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.Z7:
-    1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:149 -> a
-    1:150:boolean addAll(java.util.Collection,java.lang.Object[]):0 -> a
-    151:190:int com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt.collectionSizeOrDefault(java.lang.Iterable,int):0:39 -> a
-    151:190:int collectionSizeOrDefault(java.lang.Iterable,int):0 -> a
-    191:266:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOf(java.lang.Object[]):0:75 -> a
-    191:266:java.util.List listOf(java.lang.Object[]):0 -> a
-    267:2341:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.plus(java.util.Collection,java.lang.Iterable):0:2074 -> a
-    267:2341:java.util.List plus(java.util.Collection,java.lang.Iterable):0 -> a
-    2342:4869:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):0:2527 -> a
-    2342:4869:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
-    4870:6732:void com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.sortWith(java.lang.Object[],java.util.Comparator):0:1862 -> a
-    4870:6732:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):947 -> a
-    4870:6732:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
-    6733:8313:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):947:2527 -> a
-    6733:8313:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
-    8314:8314:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.throwIndexOverflow():388:388 -> a
-    8314:8314:void throwIndexOverflow():0 -> a
-    8315:8315:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315:2315 -> a
-    8315:8315:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    8316:10632:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2316 -> a
-    8316:10632:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
-    8316:10632:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    10633:12936:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinTo(java.lang.Iterable,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2303 -> a
-    10633:12936:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2316 -> a
-    10633:12936:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
-    10633:12936:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    12937:12937:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2316:2316 -> a
-    12937:12937:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2315 -> a
-    12937:12937:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    1:1172:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):0:1171 -> b
-    1:1172:java.util.List toList(java.lang.Iterable):0 -> b
-    1173:2366:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
-    1173:2366:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1174 -> b
-    1173:2366:java.util.List toList(java.lang.Iterable):0 -> b
-    2367:2367:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1173:1173 -> b
-    2367:2367:java.util.List toList(java.lang.Iterable):0 -> b
-    2368:2373:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1172:1177 -> b
-    2368:2373:java.util.List toList(java.lang.Iterable):0 -> b
-    2374:2596:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):0:222 -> b
-    2374:2596:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1177 -> b
-    2374:2596:java.util.List toList(java.lang.Iterable):0 -> b
-    2597:2597:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):221:221 -> b
-    2597:2597:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1177 -> b
-    2597:2597:java.util.List toList(java.lang.Iterable):0 -> b
-    2598:2598:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOfNotNull(java.lang.Object):118:118 -> b
-    2598:2598:java.util.List listOfNotNull(java.lang.Object):0 -> b
-    1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):0:1206 -> c
-    1:1207:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1208:1208:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205:1205 -> c
-    1208:1208:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1209:1209:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsJVMKt.setOf(java.lang.Object):16:16 -> c
-    1209:1209:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205 -> c
-    1209:1209:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1210:1210:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1204:1204 -> c
-    1210:1210:java.util.Set toSet(java.lang.Iterable):0 -> c
-    1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):0:1387 -> d
-    1:1388:java.lang.Iterable withIndex(java.lang.Iterable):0 -> d
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.a8:
+    1:2:int indexOf(int[],int):1514:1515 -> a
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.a8:
+    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
+    143:182:int com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt.collectionSizeOrDefault(java.lang.Iterable,int):0:39 -> a
+    143:182:int collectionSizeOrDefault(java.lang.Iterable,int):0 -> a
+    183:260:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOf(java.lang.Object[]):0:77 -> a
+    183:260:java.util.List listOf(java.lang.Object[]):0 -> a
+    261:3337:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.plus(java.util.Collection,java.lang.Iterable):0:3076 -> a
+    261:3337:java.util.List plus(java.util.Collection,java.lang.Iterable):0 -> a
+    3338:6871:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):0:3533 -> a
+    3338:6871:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
+    6872:9429:void com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.sortWith(java.lang.Object[],java.util.Comparator):0:2557 -> a
+    6872:9429:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):1023 -> a
+    6872:9429:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
+    9430:11940:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):1023:3533 -> a
+    9430:11940:java.util.List sortedWith(java.lang.Iterable,java.util.Comparator):0 -> a
+    11941:11941:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.throwIndexOverflow():461:461 -> a
+    11941:11941:void throwIndexOverflow():0 -> a
+    11942:11942:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):3320:3320 -> a
+    11942:11942:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    11943:15264:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:3321 -> a
+    11943:15264:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):3320 -> a
+    11943:15264:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    15265:18573:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinTo(java.lang.Iterable,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:3308 -> a
+    15265:18573:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):3321 -> a
+    15265:18573:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):3320 -> a
+    15265:18573:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    18574:18574:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):3321:3321 -> a
+    18574:18574:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):3320 -> a
+    18574:18574:java.lang.String joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
+    1:1262:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):0:1261 -> b
+    1:1262:java.util.List toList(java.lang.Iterable):0 -> b
+    1263:2546:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1283 -> b
+    1263:2546:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1264 -> b
+    1263:2546:java.util.List toList(java.lang.Iterable):0 -> b
+    2547:2547:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1263:1263 -> b
+    2547:2547:java.util.List toList(java.lang.Iterable):0 -> b
+    2548:2553:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1262:1267 -> b
+    2548:2553:java.util.List toList(java.lang.Iterable):0 -> b
+    2554:2845:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):0:291 -> b
+    2554:2845:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1267 -> b
+    2554:2845:java.util.List toList(java.lang.Iterable):0 -> b
+    2846:2846:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):290:290 -> b
+    2846:2846:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1267 -> b
+    2846:2846:java.util.List toList(java.lang.Iterable):0 -> b
+    2847:2847:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.listOfNotNull(java.lang.Object):120:120 -> b
+    2847:2847:java.util.List listOfNotNull(java.lang.Object):0 -> b
+    1:1297:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):0:1296 -> c
+    1:1297:java.util.Set toSet(java.lang.Iterable):0 -> c
+    1298:1298:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1295:1295 -> c
+    1298:1298:java.util.Set toSet(java.lang.Iterable):0 -> c
+    1299:1299:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsJVMKt.setOf(java.lang.Object):18:18 -> c
+    1299:1299:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1295 -> c
+    1299:1299:java.util.Set toSet(java.lang.Iterable):0 -> c
+    1300:1300:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1294:1294 -> c
+    1300:1300:java.util.Set toSet(java.lang.Iterable):0 -> c
+    1:1579:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):0:1578 -> d
+    1:1579:java.lang.Iterable withIndex(java.lang.Iterable):0 -> d
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.b8:
 # {"id":"sourceFile","fileName":"Collections.kt"}
-    1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):19:19 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.b8:
+    1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):20:20 -> a
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.c8:
 # {"id":"sourceFile","fileName":"IteratorsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.c8:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.d8:
 # {"id":"sourceFile","fileName":"MutableCollectionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.d8:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.e8:
 # {"id":"sourceFile","fileName":"ReversedViews.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.g8:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
-    1:2:java.util.Collection toCollection(java.lang.Iterable,java.util.Collection):1153:1154 -> a
-    3:4:java.util.List toMutableList(java.lang.Iterable):1184:1185 -> a
-    5:1198:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> a
-    5:1198:java.util.List toMutableList(java.lang.Iterable):1185 -> a
-    1199:1199:java.util.List toMutableList(java.lang.Iterable):1186:1186 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.e8:
+    1:2:java.util.Collection toCollection(java.lang.Iterable,java.util.Collection):1243:1244 -> a
+    3:4:java.util.List toMutableList(java.lang.Iterable):1274:1275 -> a
+    5:1288:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1283 -> a
+    5:1288:java.util.List toMutableList(java.lang.Iterable):1275 -> a
+    1289:1289:java.util.List toMutableList(java.lang.Iterable):1276:1276 -> a
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.f8:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> a
-    1:1:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1387:1387 -> a
+    1:1:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1578:1578 -> a
     1:1:java.lang.Object invoke():0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.gb:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.hb:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:1:void <init>():13:13 -> <init>
-    1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.next():18:18 -> next
-    1:1:java.lang.Object next():13 -> next
-    1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.previous():19:19 -> previous
-    1:1:java.lang.Object previous():13 -> previous
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.hb:
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>():15:15 -> <init>
+    1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.next():20:20 -> next
+    1:1:java.lang.Object next():15 -> next
+    1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.previous():21:21 -> previous
+    1:1:java.lang.Object previous():15 -> previous
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.ib:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> a
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>():22:22 -> <init>
-    1:1:boolean contains(java.lang.Object):22:22 -> contains
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:1:void <init>():24:24 -> <init>
+    1:1:boolean contains(java.lang.Object):24:24 -> contains
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.collections.EmptyList.contains(java.lang.Void):0:0 -> contains
-    2:2:boolean contains(java.lang.Object):22 -> contains
-    1:1:boolean containsAll(java.util.Collection):32:32 -> containsAll
-    1:1:boolean equals(java.lang.Object):25:25 -> equals
-    1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyList.get(int):34:34 -> get
-    1:1:java.lang.Object get(int):22 -> get
-    1:1:int indexOf(java.lang.Object):22:22 -> indexOf
+    2:2:boolean contains(java.lang.Object):24 -> contains
+    1:1:boolean containsAll(java.util.Collection):34:34 -> containsAll
+    1:1:boolean equals(java.lang.Object):27:27 -> equals
+    1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyList.get(int):36:36 -> get
+    1:1:java.lang.Object get(int):24 -> get
+    1:1:int indexOf(java.lang.Object):24:24 -> indexOf
     2:2:int com.android.tools.r8.jetbrains.kotlin.collections.EmptyList.indexOf(java.lang.Void):0:0 -> indexOf
-    2:2:int indexOf(java.lang.Object):22 -> indexOf
-    1:1:java.util.Iterator iterator():38:38 -> iterator
-    1:1:int lastIndexOf(java.lang.Object):22:22 -> lastIndexOf
+    2:2:int indexOf(java.lang.Object):24 -> indexOf
+    1:1:java.util.Iterator iterator():40:40 -> iterator
+    1:1:int lastIndexOf(java.lang.Object):24:24 -> lastIndexOf
     2:2:int com.android.tools.r8.jetbrains.kotlin.collections.EmptyList.lastIndexOf(java.lang.Void):0:0 -> lastIndexOf
-    2:2:int lastIndexOf(java.lang.Object):22 -> lastIndexOf
-    1:1:java.util.ListIterator listIterator():39:39 -> listIterator
-    2:2:java.util.ListIterator listIterator(int):42:42 -> listIterator
-    3:3:java.util.ListIterator listIterator(int):41:41 -> listIterator
-    1:1:java.util.List subList(int,int):47:47 -> subList
-    1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.ib:
+    2:2:int lastIndexOf(java.lang.Object):24 -> lastIndexOf
+    1:1:java.util.ListIterator listIterator():41:41 -> listIterator
+    2:2:java.util.ListIterator listIterator(int):44:44 -> listIterator
+    3:3:java.util.ListIterator listIterator(int):43:43 -> listIterator
+    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.jb:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:1:void <init>():13:13 -> <init>
-    1:1:boolean containsValue(java.lang.Object):13:13 -> containsValue
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>():14:14 -> <init>
+    1:1:boolean containsValue(java.lang.Object):14:14 -> containsValue
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap.containsValue(java.lang.Void):0:0 -> containsValue
-    2:2:boolean containsValue(java.lang.Object):13 -> containsValue
-    1:1:java.util.Set entrySet():13:13 -> entrySet
-    1:1:boolean equals(java.lang.Object):16:16 -> equals
-    1:1:java.util.Set keySet():13:13 -> keySet
-    1:1:java.lang.String toString():18:18 -> toString
-    1:1:java.util.Collection values():13:13 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.kb:
+    2:2:boolean containsValue(java.lang.Object):14 -> containsValue
+    1:1:java.util.Set entrySet():14:14 -> entrySet
+    1:1:boolean equals(java.lang.Object):17:17 -> equals
+    1:1:java.util.Set keySet():14:14 -> keySet
+    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.lb:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> a
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:1:void <init>():12:12 -> <init>
-    1:1:boolean contains(java.lang.Object):12:12 -> contains
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>():14:14 -> <init>
+    1:1:boolean contains(java.lang.Object):14:14 -> contains
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.collections.EmptySet.contains(java.lang.Void):0:0 -> contains
-    2:2:boolean contains(java.lang.Object):12 -> contains
-    1:1:boolean containsAll(java.util.Collection):22:22 -> containsAll
-    1:1:boolean equals(java.lang.Object):15:15 -> equals
-    1:1:java.util.Iterator iterator():24:24 -> iterator
-    1:1:java.lang.String toString():17:17 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.Ff:
+    2:2:boolean contains(java.lang.Object):14 -> contains
+    1:1:boolean containsAll(java.util.Collection):24:24 -> containsAll
+    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.ag:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     java.lang.Object value -> b
     int index -> a
     1:1:void <init>(int,java.lang.Object):14:14 -> <init>
     1:1:int getIndex():14:14 -> a
     1:1:java.lang.Object getValue():14:14 -> b
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.bg:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):24:24 -> <init>
     1:1:java.util.Iterator iterator():25:25 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.cg:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> a
-    1:1:void <init>(java.util.Iterator):37:37 -> <init>
-    1:1:boolean hasNext():39:39 -> hasNext
-    1:1:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator.next():40:40 -> next
-    1:1:java.lang.Object next():37 -> next
-    2:2:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.throwIndexOverflow():388:388 -> next
-    2:2:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.throwIndexOverflow():0 -> next
-    2:2:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator.next():40 -> next
-    2:2:java.lang.Object next():37 -> next
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.lq:
-    1:499:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):0:498 -> a
-    1:499:java.util.Map toMap(java.lang.Iterable):0 -> a
-    500:500:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):497:497 -> a
-    500:500:java.util.Map toMap(java.lang.Iterable):0 -> a
-    501:528:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.mapOf(com.android.tools.r8.jetbrains.kotlin.Pair):0:27 -> a
-    501:528:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):497 -> a
-    501:528:java.util.Map toMap(java.lang.Iterable):0 -> a
-    529:529:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):496:496 -> a
-    529:529:java.util.Map toMap(java.lang.Iterable):0 -> a
-    530:530:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.mapCapacity(int):134:134 -> a
-    530:530:int mapCapacity(int):0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.mq:
+    1:1:void <init>(java.util.Iterator):38:38 -> <init>
+    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.Jq:
+    int mapCapacity(int) -> a
+    1:549:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):0:548 -> a
+    1:549:java.util.Map toMap(java.lang.Iterable):0 -> a
+    550:550:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):547:547 -> a
+    550:550:java.util.Map toMap(java.lang.Iterable):0 -> a
+    551:578:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.mapOf(com.android.tools.r8.jetbrains.kotlin.Pair):0:27 -> a
+    551:578:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):547 -> a
+    551:578:java.util.Map toMap(java.lang.Iterable):0 -> a
+    579:579:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):546:546 -> a
+    579:579:java.util.Map toMap(java.lang.Iterable):0 -> a
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.Kq:
 # {"id":"sourceFile","fileName":"MapsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.nq:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.Lq:
 # {"id":"sourceFile","fileName":"_Maps.kt"}
-    1:365:void com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.putAll(java.util.Map,java.lang.Iterable):0:364 -> a
-    1:365:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable,java.util.Map):508 -> a
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.yw:
+    1:415:void com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.putAll(java.util.Map,java.lang.Iterable):0:414 -> a
+    1:415:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable,java.util.Map):558 -> a
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.Sw:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int mod(int,int):10:10 -> a
     2:2:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
@@ -57218,49 +57541,92 @@
     3:3:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
     3:3:int getProgressionLastElement(int,int,int):47 -> a
     4:4:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.Tj:
+com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.pk:
 # {"id":"sourceFile","fileName":"JvmClassMapping.kt"}
-    1:8:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    9:16:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    17:17:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:62 -> a
-    18:28:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    35:35:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
-    36:39:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    42:42:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):64:64 -> a
-    43:49:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    57:57:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):69:69 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.En:
-# {"id":"sourceFile","fileName":"KotlinReflectionNotSupportedError.kt"}
-    1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.td:
+    1:10:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:67 -> a
+    11:19:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:70 -> a
+    20:20:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
+    21:27:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):63:69 -> a
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.ud:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.ud:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.wd:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.wd:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.vd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.xd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.yd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.zd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.Ad:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.Bd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.Cd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.Dd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.Ed:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.Fd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.Kd:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.G3:
-    com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver INSTANCE -> a
-    1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>():39:39 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver access$000():39:39 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.a7:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.Hd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.Id:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.Jd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.Ld:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.Md:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.Nd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.Od:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.Pd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.Qd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.Rd:
+# {"id":"sourceFile","fileName":"Functions.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.a6:
+# {"id":"sourceFile","fileName":"ClassBasedDeclarationContainer.kt"}
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.b7:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
+    java.util.Map FUNCTION_CLASSES -> b
     java.lang.Class jClass -> a
+    1:7:void <clinit>():97:97 -> <clinit>
+    112:115:void <clinit>():202:205 -> <clinit>
+    116:116:void <clinit>():103:103 -> <clinit>
+    117:117:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> <clinit>
+    117:117:void <clinit>():103 -> <clinit>
+    118:221:void <clinit>():103:103 -> <clinit>
+    223:326:void <clinit>():105:208 -> <clinit>
+    327:327:void <clinit>():152:152 -> <clinit>
+    328:328:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> <clinit>
+    328:328:void <clinit>():152 -> <clinit>
+    329:391:void <clinit>():152:214 -> <clinit>
+    392:392:void <clinit>():212:212 -> <clinit>
+    393:393:void <clinit>():159:159 -> <clinit>
     1:1:void <init>(java.lang.Class):10:10 -> <init>
     1:1:java.lang.Class getJClass():10:10 -> a
-    1:1:boolean equals(java.lang.Object):82:82 -> equals
-    1:1:int hashCode():85:85 -> hashCode
-    1:1:java.lang.String toString():88:88 -> toString
+    1:1:boolean equals(java.lang.Object):87:87 -> equals
+    1:1:int hashCode():90:90 -> hashCode
+    1:1:java.lang.String toString():93:93 -> toString
     2:2:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.getJClass():10:10 -> toString
-    2:2:java.lang.String toString():88 -> toString
-    3:3:java.lang.String toString():88:88 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.X7:
+    2:2:java.lang.String toString():93 -> toString
+    3:3:java.lang.String toString():93:93 -> toString
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.Y7:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
-    1:1:void <clinit>():130:130 -> <clinit>
+    1:1:void <clinit>():14:14 -> <clinit>
     1:77:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):30:106 -> a
     78:154:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):34:34 -> a
     159:247:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):39:127 -> a
@@ -57269,117 +57635,42 @@
     253:256:java.lang.Object[] toArray(java.util.Collection):83:86 -> a
     257:340:java.lang.Object[] toArray(java.util.Collection):21:104 -> a
     341:341:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.u9:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.Ci:
-    int compare(int,int) -> a
-    1:1:void throwNpe():37:37 -> a
-    2:2:void throwUninitializedPropertyAccessException(java.lang.String):49:49 -> a
-    3:3:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwUninitializedProperty(java.lang.String):45:45 -> a
-    3:3:void throwUninitializedPropertyAccessException(java.lang.String):49 -> a
-    4:4:void checkExpressionValueIsNotNull(java.lang.Object,java.lang.String):78:78 -> a
-    5:5:boolean areEqual(java.lang.Object,java.lang.Object):153:153 -> a
-    6:6:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):237:237 -> a
-    7:18:java.lang.Throwable com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.sanitizeStackTrace(java.lang.Throwable,java.lang.String):241:252 -> a
-    7:18:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):237 -> a
-    1:15:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullException(java.lang.String):127:141 -> b
-    1:15:void checkParameterIsNotNull(java.lang.Object,java.lang.String):116 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.Un:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.Xi:
+    1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwJavaNpe():45:45 -> a
+    1:1:void checkNotNull(java.lang.Object):25 -> a
+    2:2:void throwUninitializedPropertyAccessException(java.lang.String):58:58 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwUninitializedProperty(java.lang.String):54:54 -> a
+    3:3:void throwUninitializedPropertyAccessException(java.lang.String):58 -> a
+    4:4:void checkNotNullExpressionValue(java.lang.Object,java.lang.String):93:93 -> a
+    5:5:boolean areEqual(java.lang.Object,java.lang.Object):167:167 -> a
+    6:6:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):251:251 -> a
+    7:18:java.lang.Throwable com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.sanitizeStackTrace(java.lang.Throwable,java.lang.String):255:266 -> a
+    7:18:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):251 -> a
+    1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> b
+    1:1:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> b
+    2:13:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.createParameterIsNullExceptionMessage(java.lang.String):144:155 -> b
+    2:13:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140 -> b
+    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.Lambda -> com.android.tools.r8.internal.ro:
 # {"id":"sourceFile","fileName":"Lambda.kt"}
     1:1:void <init>(int):10:10 -> <init>
     1:1:java.lang.String toString():11:11 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.Gw:
-    com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.reflected -> a
-    java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.receiver -> b
-    java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.NO_RECEIVER -> c
-    1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.<clinit>():36:36 -> <clinit>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.<init>():48:48 -> <init>
-    1:1:void <init>():14 -> <init>
-    2:3:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.<init>(java.lang.Object):52:53 -> <init>
-    2:3:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.<init>():48 -> <init>
-    2:3:void <init>():14 -> <init>
-    1:3:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():65:67 -> a
-    1:3:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():0 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.computeReflected():24:24 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.computeReflected():0 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():67 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():0 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():68:68 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():0 -> a
-    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getName() -> b
-    com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getOwner() -> c
-    java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getSignature() -> d
-    1:3:boolean equals(java.lang.Object):43:45 -> equals
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getBoundReceiver():60:60 -> equals
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getBoundReceiver():0 -> equals
-    4:4:boolean equals(java.lang.Object):45 -> equals
-    5:11:boolean equals(java.lang.Object):45:51 -> equals
-    1:1:int hashCode():58:58 -> hashCode
-    1:6:java.lang.String toString():63:68 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.Fw:
-    com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer owner -> d
-    java.lang.String signature -> f
-    java.lang.String name -> e
-    1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.<init>():14:14 -> <init>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):15 -> <init>
-    2:4:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):16:18 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():75:75 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> a
-    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl.get(java.lang.Object):38 -> a
-    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):29 -> a
-    1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25:25 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> a
-    2:2:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl.get(java.lang.Object):38 -> a
-    2:2:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):29 -> a
-    2:2:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34:34 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> a
-    3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl.get(java.lang.Object):38 -> a
-    3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):29 -> a
-    3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> a
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl.get(java.lang.Object):38:38 -> a
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):29 -> a
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():77:77 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> a
-    5:5:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl.get(java.lang.Object):38 -> a
-    5:5:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):29 -> a
-    5:5:java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.invoke(java.lang.Object):0 -> a
-    1:1:java.lang.String getName():28:28 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():23:23 -> c
-    1:1:java.lang.String getSignature():33:33 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():75:75 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25:25 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34:34 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getReflected():77:77 -> e
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25 -> e
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> e
-    4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.Oz:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.pA:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
-    1:9:void <clinit>():22:30 -> <clinit>
-    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):50:50 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KClass com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinClass(java.lang.Class):27:27 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):50 -> a
-    3:3:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):69:69 -> a
-    4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):41:42 -> 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):36 -> a
-    4:5:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):69 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.Pz:
-    1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.Xh:
+    1:9:void <clinit>():26:34 -> <clinit>
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):59:59 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KClass com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinClass(java.lang.Class):30:30 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):59 -> a
+    3:3:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):78:78 -> a
+    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.qA:
+    1:1:void <init>():14:14 -> <init>
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.si:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
     int last -> b
     int step -> c
@@ -57396,7 +57687,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression.iterator():99:99 -> iterator
     1:1:java.util.Iterator iterator():72 -> iterator
     1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.Yh:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.ti:
 # {"id":"sourceFile","fileName":"ProgressionIterators.kt"}
     int step -> d
     boolean hasNext -> b
@@ -57408,21 +57699,18 @@
     1:1:boolean hasNext():43:43 -> hasNext
     1:4:int com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator.nextInt():46:49 -> next
     1:4:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():36 -> next
-    1:4:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     1:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():35 -> next
     1:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     5:9:int com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator.nextInt():48:52 -> next
     5:9:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():36 -> next
-    5:9:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     5:9:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():35 -> next
     5:9:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     10:10:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():36:36 -> next
-    10:10:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():35 -> next
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0:0 -> remove
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0 -> remove
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.vi:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> d
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> e
@@ -57433,56 +57721,50 @@
     1:1:int hashCode():52:52 -> hashCode
     1:1:boolean isEmpty():45:45 -> isEmpty
     1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.internal.Zh:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.internal.ui:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
     1:1:void <init>():56:56 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):56:56 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.internal.Dy:
-    1:1:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):1024:1024 -> a
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.internal.Vy:
+    1:1:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):1103:1103 -> a
     1:1:int coerceIn(int,int,int):0 -> a
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.internal.Ey:
-# {"id":"sourceFile","fileName":"Ranges.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.Xk:
-# {"id":"sourceFile","fileName":"KCallable.kt"}
-    java.lang.Object call(java.lang.Object[]) -> a
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.Yk:
-# {"id":"sourceFile","fileName":"KDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.bl:
-# {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.al:
-# {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.Zk:
-# {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.vB:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt -> com.android.tools.r8.internal.Wy:
+# {"id":"sourceFile","fileName":"_Ranges.kt"}
+com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.xl:
+# {"id":"sourceFile","fileName":"KClass.kt"}
+com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.VB:
 # {"id":"sourceFile","fileName":"Sequence.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.YE:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.AF:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 transformer -> b
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):168:168 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 access$getTransformer$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> b
-    1:1:java.util.Iterator iterator():169:169 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.XE:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):206:206 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):205:205 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 access$getTransformer$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):205:205 -> b
+    1:1:java.util.Iterator iterator():207:207 -> iterator
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.zF:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.util.Iterator iterator -> a
     com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence this$0 -> b
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):169:170 -> <init>
-    1:1:boolean hasNext():176:176 -> hasNext
-    1:1:java.lang.Object next():172:172 -> next
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.H9:
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):207:208 -> <init>
+    1:1:boolean hasNext():214:214 -> hasNext
+    1:1:java.lang.Object next():210:210 -> next
+com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt -> com.android.tools.r8.internal.T5:
+# {"id":"sourceFile","fileName":"Char.kt"}
+    1:2:boolean equals(char,char,boolean):35:36 -> a
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.I9:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence input -> a
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
     int startIndex -> b
     int limit -> c
-    1:1:void <init>(java.lang.CharSequence,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):1072:1072 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 access$getGetNextMatch$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> a
-    1:1:java.lang.CharSequence access$getInput$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> b
-    1:1:int access$getLimit$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> c
-    1:1:int access$getStartIndex$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> d
-    1:1:java.util.Iterator iterator():1079:1079 -> iterator
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.G9:
+    1:1:void <init>(java.lang.CharSequence,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):1075:1075 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 access$getGetNextMatch$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1075:1075 -> a
+    1:1:java.lang.CharSequence access$getInput$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1075:1075 -> b
+    1:1:int access$getLimit$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1075:1075 -> c
+    1:1:int access$getStartIndex$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1075:1075 -> d
+    1:1:java.util.Iterator iterator():1082:1082 -> iterator
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.H9:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange nextItem -> d
     com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence this$0 -> f
@@ -57490,156 +57772,153 @@
     int currentStartIndex -> b
     int nextSearchIndex -> c
     int nextState -> a
-    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1079:1082 -> <init>
-    1:3:boolean hasNext():1123:1125 -> hasNext
-    1:15:void calcNext():1087:1101 -> k
-    16:16:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):705:705 -> k
-    16:16:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> k
-    16:16:void calcNext():1101 -> k
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1082:1085 -> <init>
+    1:3:boolean hasNext():1126:1128 -> hasNext
+    1:15:void calcNext():1090:1104 -> k
+    16:16:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):784:784 -> k
+    16:16:void calcNext():1104 -> k
     17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion.getEMPTY():58:58 -> k
-    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):705 -> k
-    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> k
-    17:17:void calcNext():1101 -> k
-    18:18:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):706:706 -> k
-    18:18:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.until(int,int):0 -> k
-    18:18:void calcNext():1101 -> k
-    19:24:void calcNext():1101:1106 -> k
-    1:8:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1111:1118 -> next
-    1:8:java.lang.Object next():1079 -> next
-    9:9:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1115:1115 -> next
-    9:9:java.lang.Object next():1079 -> next
-    10:10:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1114:1114 -> next
-    10:10:java.lang.Object next():1079 -> next
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.UD:
-    1:62:void com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt.appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:61 -> a
-    1:62:void appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):784 -> k
+    17:17:void calcNext():1104 -> k
+    18:18:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.until(int,int):785:785 -> k
+    18:18:void calcNext():1104 -> k
+    19:24:void calcNext():1104:1109 -> k
+    1:8:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1114:1121 -> next
+    1:8:java.lang.Object next():1082 -> next
+    9:9:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1118:1118 -> next
+    9:9:java.lang.Object next():1082 -> next
+    10:10:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1117:1117 -> next
+    10:10:java.lang.Object next():1082 -> next
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.vE:
+    1:89:void com.android.tools.r8.jetbrains.kotlin.text.StringsKt__AppendableKt.appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:88 -> a
+    1:89:void appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
     boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object) -> a
-    63:127:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):0:64 -> a
-    63:127:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    63:127:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    128:128:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):0:0 -> a
-    128:128:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    128:128:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    128:128:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    128:128:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt(java.lang.CharSequence,char[],int,boolean,int):1143:1143 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt$default(java.lang.CharSequence,char[],int,boolean,int,int,java.lang.Object):1140 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    129:129:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    129:129:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    129:129:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    130:130:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218:1218 -> a
-    130:130:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    130:130:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    130:130:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    130:130:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:859 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1218 -> a
-    131:990:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1217 -> a
-    131:990:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    131:990:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    131:990:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    991:991:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64:64 -> a
-    991:991:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    991:991:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    992:992:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737:1737 -> a
-    992:992:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    992:992:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    992:992:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    992:992:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    993:2731:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:1738 -> a
-    993:2731:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
-    993:2731:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    993:2731:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    993:2731:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    993:2731:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    2732:4455:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinTo(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:1723 -> a
-    2732:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1738 -> a
-    2732:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
-    2732:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    2732:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    2732:4455:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    2732:4455:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    4456:4456:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1738:1738 -> a
-    4456:4456:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):1737 -> a
-    4456:4456:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):0 -> a
-    4456:4456:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):64 -> a
-    4456:4456:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):60 -> a
-    4456:4456:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
-    4457:4457:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):195:195 -> a
-    4457:4457:boolean startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.VD:
-# {"id":"sourceFile","fileName":"RegexExtensionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.WD:
-# {"id":"sourceFile","fileName":"StringBuilderJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.XD:
-# {"id":"sourceFile","fileName":"StringNumberConversionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.internal.YD:
-# {"id":"sourceFile","fileName":"StringsJVM.kt"}
-    1:3:boolean startsWith(java.lang.String,java.lang.String,boolean):197:199 -> a
-    4:396:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):0:392 -> a
-    4:396:boolean startsWith(java.lang.String,java.lang.String,boolean):199 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.ZD:
+    90:157:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):0:67 -> a
+    90:157:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    90:157:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    158:158:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):0:0 -> a
+    158:158:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1220 -> a
+    158:158:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    158:158:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    158:158:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    159:159:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt(java.lang.CharSequence,char[],int,boolean,int):1146:1146 -> a
+    159:159:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.rangesDelimitedBy$StringsKt__StringsKt$default(java.lang.CharSequence,char[],int,boolean,int,int,java.lang.Object):1143 -> a
+    159:159:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1221 -> a
+    159:159:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1220 -> a
+    159:159:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    159:159:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    159:159:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    160:160:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1221:1221 -> a
+    160:160:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1220 -> a
+    160:160:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    160:160:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    160:160:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    161:1168:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:1007 -> a
+    161:1168:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence(java.lang.CharSequence,char[],boolean,int):1221 -> a
+    161:1168:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.splitToSequence$default(java.lang.CharSequence,char[],boolean,int,int,java.lang.Object):1220 -> a
+    161:1168:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    161:1168:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    161:1168:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1169:1169:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67:67 -> a
+    1169:1169:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    1169:1169:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1170:1170:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2696:2696 -> a
+    1170:1170:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    1170:1170:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    1170:1170:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    1171:3868:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2697 -> a
+    1171:3868:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2696 -> a
+    1171:3868:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    1171:3868:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    1171:3868:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    3869:6551:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinTo(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:2682 -> a
+    3869:6551:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2697 -> a
+    3869:6551:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2696 -> a
+    3869:6551:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    3869:6551:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    3869:6551:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    6552:6552:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):2697:2697 -> a
+    6552:6552:java.lang.String com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.joinToString$default(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):2696 -> a
+    6552:6552:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):67 -> a
+    6552:6552:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):63 -> a
+    6552:6552:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
+    6553:6553:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast(java.lang.String,char,java.lang.String):0:0 -> a
+    6553:6553: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):421 -> a
+    6553:6553:java.lang.String substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):0 -> a
+    6554:6554:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.lastIndexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):1020:1020 -> a
+    6554:6554:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast(java.lang.String,char,java.lang.String):422 -> a
+    6554:6554: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):421 -> a
+    6554:6554:java.lang.String substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):0 -> a
+    6555:7579:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.lastIndexOf(java.lang.CharSequence,char,int,boolean):0:1024 -> a
+    6555:7579:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.lastIndexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):1020 -> a
+    6555:7579:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast(java.lang.String,char,java.lang.String):422 -> a
+    6555:7579: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):421 -> a
+    6555:7579:java.lang.String substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):0 -> a
+    7580:7580:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast(java.lang.String,char,java.lang.String):423:423 -> a
+    7580:7580: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):421 -> a
+    7580:7580:java.lang.String substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):0 -> a
+    7581:7581:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):360:360 -> a
+    7581:7581:boolean startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):0 -> a
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.wE:
+# {"id":"sourceFile","fileName":"Indent.kt"}
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.xE:
+# {"id":"sourceFile","fileName":"RegexExtensions.kt"}
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.yE:
+# {"id":"sourceFile","fileName":"StringBuilder.kt"}
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.zE:
+# {"id":"sourceFile","fileName":"StringNumberConversions.kt"}
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.CE:
+# {"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):1062 -> a
+    2:996:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):0:994 -> a
+    2:996:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):990 -> a
+    2:996:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1063 -> a
+    2:996:boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1062 -> a
+    997:997:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):992:992 -> a
+    997:997:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):990 -> a
+    997:997:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1063 -> a
+    997:997:boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1062 -> a
+    998:998:int getLastIndex(java.lang.CharSequence):317:317 -> a
+    999:1001:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):362:364 -> a
+    1002:1565:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):0:563 -> a
+    1002:1565:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):364 -> a
+    1566:2152:int indexOfAny(java.lang.CharSequence,char[],int,boolean):837:1423 -> a
+    2153:2153:int indexOfAny(java.lang.CharSequence,char[],int,boolean):844:844 -> a
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.AE:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     char[] $delimiters -> a
     boolean $ignoreCase -> b
-    1:1145:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2.invoke(java.lang.CharSequence,int):0:1144 -> a
-    1:1145:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
-    1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
-    1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2.invoke(java.lang.CharSequence,int):1144 -> a
-    1146:1146:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.internal.aE:
+    1:1148:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2.invoke(java.lang.CharSequence,int):0:1147 -> a
+    1:1148:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
+    1149:1149:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
+    1149:1149:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2.invoke(java.lang.CharSequence,int):1147 -> a
+    1149:1149:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.internal.BE:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence $this_splitToSequence -> a
-    1:1219:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1218 -> a
-    1:1219:java.lang.Object invoke(java.lang.Object):0 -> a
-    1220:1220:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:0 -> a
-    1220:1220:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
-    1220:1220:java.lang.Object invoke(java.lang.Object):0 -> a
-    1221:1221:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getStart():40:40 -> a
-    1221:1221:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361 -> a
-    1221:1221:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
-    1221:1221:java.lang.Object invoke(java.lang.Object):0 -> a
-    1222:1222:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361:361 -> a
-    1222:1222:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
-    1222:1222:java.lang.Object invoke(java.lang.Object):0 -> a
-    1223:1223:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getEndInclusive():41:41 -> a
-    1223:1223:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361 -> a
-    1223:1223:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
+    1:1222:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1221 -> a
+    1:1222:java.lang.Object invoke(java.lang.Object):0 -> a
+    1223:1223:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:0 -> a
+    1223:1223:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1221 -> a
     1223:1223:java.lang.Object invoke(java.lang.Object):0 -> a
-    1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361:361 -> a
-    1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
+    1224:1224:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getStart():40:40 -> a
+    1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361 -> a
+    1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1221 -> a
     1224:1224:java.lang.Object invoke(java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.internal.bE:
-# {"id":"sourceFile","fileName":"_StringsJvm.kt"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
-    2:994:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):0:992 -> a
-    2:994:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):988 -> a
-    2:994:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1060 -> a
-    2:994:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
-    995:995:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf(java.lang.CharSequence,char,int,boolean):990:990 -> a
-    995:995:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object):988 -> a
-    995:995:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):1060 -> a
-    995:995:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1059 -> a
-    996:996:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.getLastIndex(java.lang.CharSequence):317:317 -> a
-    997:997:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):835:835 -> a
-    998:3376:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):0:2378 -> a
-    998:3376:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
-    998:3376:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
-    3377:3377:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):837:837 -> a
-    3378:3378:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):2379:2379 -> a
-    3378:3378:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
-    3378:3378:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
-    3379:3379:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.single(char[]):2377:2377 -> a
-    3379:3379:char com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt.single(char[]):0 -> a
-    3379:3379:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):836 -> a
-    3380:3961:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):840:1421 -> a
-    3962:3963:boolean com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt.equals(char,char,boolean):35:36 -> a
-    3962:3963:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):842 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Tc:
+    1225:1225:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361:361 -> a
+    1225:1225:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1221 -> a
+    1225:1225:java.lang.Object invoke(java.lang.Object):0 -> a
+    1226:1226:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.ranges.IntRange.getEndInclusive():41:41 -> a
+    1226:1226:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361 -> a
+    1226:1226:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1221 -> a
+    1226:1226:java.lang.Object invoke(java.lang.Object):0 -> a
+    1227:1227:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361:361 -> a
+    1227:1227:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1221 -> a
+    1227:1227:java.lang.Object invoke(java.lang.Object):0 -> a
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.DE:
+# {"id":"sourceFile","fileName":"_Strings.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Uc:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -57650,38 +57929,38 @@
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):43:43 -> <init>
     1:1:boolean invoke(int):52:52 -> a
     1:1:int plus$kotlinx_metadata(int):46:46 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.Tc$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.Uc$a:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
-    1:7:void <clinit>():424:430 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.Tc$b:
+    1:7:void <clinit>():447:453 -> <clinit>
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.Uc$b:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_REIFIED -> a
-    1:1:void <clinit>():441:441 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Tc$c:
+    1:1:void <clinit>():464:464 -> <clinit>
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Uc$c:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag DECLARES_DEFAULT_VALUE -> a
-    1:13:void <clinit>():455:467 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.bd:
+    1:13:void <clinit>():478:490 -> <clinit>
+com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.cd:
 # {"id":"sourceFile","fileName":"Flags.kt"}
-    1:1:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
-    2:2:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Df:
+    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.Yf:
 # {"id":"sourceFile","fileName":"InconsistentKotlinMetadataException.kt"}
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.cl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.yl:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.Map arguments -> b
     java.lang.String className -> a
     1:1:void <init>(java.lang.String,java.util.Map):18:18 -> <init>
     1:1:java.util.Map getArguments():18:18 -> a
     1:1:java.lang.String getClassName():18:18 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.zl:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.dl$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.zl$a:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation value -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):51:51 -> <init>
@@ -57695,12 +57974,12 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue.getValue():51:51 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.dl$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.zl$b:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.List value -> a
     1:1:void <init>(java.util.List):52:52 -> <init>
     1:1:java.util.List getValue():52:52 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.dl$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.zl$c:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):38:38 -> <init>
@@ -57717,7 +57996,7 @@
     1:1:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():38:38 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.dl$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.zl$d:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):31:31 -> <init>
@@ -57734,7 +58013,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():31:31 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.dl$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.zl$e:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):32:32 -> <init>
@@ -57751,7 +58030,7 @@
     1:1:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():32:32 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.dl$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.zl$f:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):37:37 -> <init>
@@ -57768,14 +58047,14 @@
     1:1:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():37:37 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.dl$g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.zl$g:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
     1:1:void <init>(java.lang.String,java.lang.String):47:47 -> <init>
     1:1:java.lang.String getEnumClassName():47:47 -> a
     1:1:java.lang.String getEnumEntryName():47:47 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.dl$h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.zl$h:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):36:36 -> <init>
@@ -57792,7 +58071,7 @@
     1:1:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():36:36 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.dl$i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.zl$i:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):34:34 -> <init>
@@ -57809,7 +58088,7 @@
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():34:34 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.dl$j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.zl$j:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
@@ -57823,7 +58102,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue.getValue():46:46 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.dl$k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.zl$k:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):35:35 -> <init>
@@ -57840,7 +58119,7 @@
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():35:35 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.dl$l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.zl$l:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):33:33 -> <init>
@@ -57857,7 +58136,7 @@
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():33:33 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.dl$m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.zl$m:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
@@ -57871,7 +58150,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():45:45 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.dl$n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.zl$n:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):40:40 -> <init>
@@ -57888,7 +58167,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue.getValue():40:40 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.dl$o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.zl$o:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):42:42 -> <init>
@@ -57905,7 +58184,7 @@
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue.getValue():42:42 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.dl$p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.zl$p:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):43:43 -> <init>
@@ -57922,7 +58201,7 @@
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue.getValue():43:43 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.dl$q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.zl$q:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):41:41 -> <init>
@@ -57939,7 +58218,7 @@
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue.getValue():41:41 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.el:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.Al:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> o
     java.lang.String companionObject -> j
@@ -57955,8 +58234,8 @@
     java.util.List sealedSubclasses -> m
     java.util.List enumEntries -> l
     java.util.List nestedClasses -> k
-    1:965:void <init>():35:999 -> <init>
-    966:1864:void <init>():102:1000 -> <init>
+    1:1020:void <init>():35:1054 -> <init>
+    1021:1971:void <init>():102:1052 -> <init>
     1:1:java.util.List getProperties():64:64 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):110:110 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):116:116 -> a
@@ -57970,31 +58249,31 @@
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor visitConstructor(int):125:125 -> a
     10:10:void visitCompanionObject(java.lang.String):128:128 -> a
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):147:147 -> a
-    12:832:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):155:975 -> a
-    833:1654:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):156:977 -> a
-    1655:1655:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):157:157 -> a
-    1656:1656:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.getFunctions():59:59 -> a
-    1656:1656:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):158 -> a
-    1657:1657:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):979:979 -> a
-    1658:1658:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):158:158 -> a
-    1659:1659:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.getProperties():64:64 -> a
-    1659:1659:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):159 -> a
-    1660:1660:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):981:981 -> a
-    1661:1661:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):159:159 -> a
-    1662:1662:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.getTypeAliases():69:69 -> a
-    1662:1662:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):160 -> a
-    1663:1663:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):983:983 -> a
-    1664:2489:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):160:985 -> a
-    2490:3316:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):161:987 -> a
-    3317:4143:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):163:989 -> a
-    4144:4971:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):164:991 -> a
-    4972:5800:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):165:993 -> a
-    5801:6630:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):166:995 -> a
-    6631:6631:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):167:167 -> a
-    6632:6632:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor.getType():54:54 -> a
-    6632:6632:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):167 -> a
-    6633:6634:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):167:168 -> a
-    6635:6635:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):155:155 -> a
+    12:886:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):155:1029 -> a
+    887:1763:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):156:1032 -> a
+    1764:1764:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):157:157 -> a
+    1765:1765:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.getFunctions():59:59 -> a
+    1765:1765:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):158 -> a
+    1766:1766:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):1034:1034 -> a
+    1767:1767:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):158:158 -> a
+    1768:1768:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.getProperties():64:64 -> a
+    1768:1768:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):159 -> a
+    1769:1769:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):1036:1036 -> a
+    1770:1770:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):159:159 -> a
+    1771:1771:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.getTypeAliases():69:69 -> a
+    1771:1771:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):160 -> a
+    1772:1772:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):1038:1038 -> a
+    1773:2653:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):160:1040 -> a
+    2654:3535:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):161:1042 -> a
+    3536:4417:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):163:1044 -> a
+    4418:5300:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):164:1046 -> a
+    5301:6184:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):165:1048 -> a
+    6185:7069:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):166:1050 -> a
+    7070:7070:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):167:167 -> a
+    7071:7071:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor.getType():54:54 -> a
+    7071:7071:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):167 -> a
+    7072:7073:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):167:168 -> a
+    7074:7074:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):155:155 -> a
     1:1:java.util.List getTypeAliases():69:69 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitSupertype(int):113:113 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):122:122 -> b
@@ -58018,9 +58297,9 @@
     1:1:java.util.List getSupertypes():54:54 -> n
     1:1:java.util.List getTypeParameters():49:49 -> o
     1:1:java.util.List getVersionRequirements():99:99 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.gl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.Cl:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.Dl:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
@@ -58037,82 +58316,82 @@
     1:1:void visitEnd():153 -> e
     2:2:void visitEnd():153:153 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.il:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.El:
 # {"id":"sourceFile","fileName":"nodes.kt"}
-    1:1:void <init>():898:898 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):898:898 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.il$a:
+    1:1:void <init>():952:952 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):952:952 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.El$a:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
-    1:1:void <init>(java.lang.String):904:904 -> <init>
-    1:1:java.lang.String getName():904:904 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.il$b:
+    1:1:void <init>(java.lang.String):958:958 -> <init>
+    1:1:java.lang.String getName():958:958 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.El$b:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
-    1:1:void <init>(java.lang.String):919:919 -> <init>
-    1:1:java.lang.String getName():919:919 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.il$c:
+    1:1:void <init>(java.lang.String):973:973 -> <init>
+    1:1:java.lang.String getName():973:973 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.El$c:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int id -> a
-    1:1:void <init>(int):911:911 -> <init>
-    1:1:int getId():911:911 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.jl:
+    1:1:void <init>(int):965:965 -> <init>
+    1:1:int getId():965:965 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Fl:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Object value -> a
-    1:1:void <init>(java.lang.Object):968:968 -> <init>
-    1:1:java.lang.Object getValue():968:968 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.kl:
+    1:1:void <init>(java.lang.Object):1022:1022 -> <init>
+    1:1:java.lang.Object getValue():1022:1022 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Gl:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> b
     java.util.List extensions -> d
     java.util.List versionRequirements -> c
     int flags -> e
-    1:736:void <init>(int):248:983 -> <init>
-    737:1461:void <init>(int):260:984 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):263:263 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):269:269 -> a
-    3:702:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):277:277 -> a
-    703:1403:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):278:278 -> a
-    1404:2105:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):279:279 -> a
-    2106:2106:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor.getType():240:240 -> a
-    2106:2106:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):279 -> a
-    2107:2108:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):279:280 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():266:266 -> b
-    1:1:int getFlags():248:248 -> c
-    1:1:java.util.List getValueParameters():252:252 -> d
-    1:1:java.util.List getVersionRequirements():257:257 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.ml:
+    1:751:void <init>(int):288:1038 -> <init>
+    752:1488:void <init>(int):300:1036 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):303:303 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):309:309 -> a
+    3:716:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):317:317 -> a
+    717:1432:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):318:318 -> a
+    1433:2149:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):319:319 -> a
+    2150:2150:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor.getType():240:240 -> a
+    2150:2150:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):319 -> a
+    2151:2152:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):319:320 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():306:306 -> b
+    1:1:int getFlags():288:288 -> c
+    1:1:java.util.List getValueParameters():292:292 -> d
+    1:1:java.util.List getVersionRequirements():297:297 -> e
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.Il:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.nl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Jl:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):210:210 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):210:210 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):246:246 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):246:246 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String) -> a
-    1:1:void visitEnd():238:238 -> a
+    1:1:void visitEnd():274:274 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.ol:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Kl:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
-    1:5:void <init>():758:762 -> <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):765:765 -> a
-    2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:773 -> a
-    206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):774:774 -> a
-    1:1:java.util.List getEffects():762:762 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.pl:
+    1:5:void <init>():812:816 -> <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):819:819 -> a
+    2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):827:827 -> a
+    206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):828:828 -> a
+    1:1:java.util.List getEffects():816:816 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Ll:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):663:663 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):663:663 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):672:672 -> a
-    2:2:void visitEnd():678:678 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.ql:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):715:715 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):715:715 -> <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):724:724 -> a
+    2:2:void visitEnd():730:730 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Ml:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List getProperties() -> a
     java.util.List getTypeAliases() -> b
     java.util.List getFunctions() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Nl:
 # {"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>
@@ -58120,22 +58399,22 @@
     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.sl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Ol:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression conclusion -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType type -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> e
-    1:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):791:796 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():807:807 -> a
-    2:163:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):815:815 -> a
-    164:165:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):816:817 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():804:804 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression getConclusion():801:801 -> d
-    1:1:java.util.List getConstructorArguments():796:796 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():790:790 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():789:789 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.tl:
+    1:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):845:850 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():861:861 -> a
+    2:164:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):869:869 -> a
+    165:166:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):870:871 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():858:858 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression getConclusion():855:855 -> d
+    1:1:java.util.List getConstructorArguments():850:850 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():844:844 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():843:843 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Pl:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -58143,61 +58422,61 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType -> e
     java.util.List orArguments -> g
     int flags -> b
-    1:33:void <init>():827:859 -> <init>
-    1:2:void visit(int,java.lang.Integer):862:863 -> a
-    3:3:void visitConstantValue(java.lang.Object):867:867 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):871:871 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():874:874 -> a
-    6:96:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):885:975 -> a
-    97:186:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):888:977 -> a
-    187:188:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):889:890 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():877:877 -> c
-    1:1:java.util.List getAndArguments():853:853 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue getConstantValue():842:842 -> e
-    1:1:int getFlags():831:831 -> f
-    1:1:java.util.List getOrArguments():859:859 -> g
-    1:1:java.lang.Integer getParameterIndex():837:837 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():847:847 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.ul:
+    1:33:void <init>():881:913 -> <init>
+    1:2:void visit(int,java.lang.Integer):916:917 -> a
+    3:3:void visitConstantValue(java.lang.Object):921:921 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):925:925 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():928:928 -> a
+    6:97:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):939:1030 -> a
+    98:188:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):942:1032 -> a
+    189:190:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):943:944 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():931:931 -> c
+    1:1:java.util.List getAndArguments():907:907 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue getConstantValue():896:896 -> e
+    1:1:int getFlags():885:885 -> f
+    1:1:java.util.List getOrArguments():913:913 -> g
+    1:1:java.lang.Integer getParameterIndex():891:891 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():901:901 -> i
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.Ql:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):722:722 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):722:722 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):774:774 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):774:774 -> <init>
     void visit(int,java.lang.Integer) -> a
     void visitConstantValue(java.lang.Object) -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):749:749 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():756:756 -> a
-    1:1:void visitEnd():769:769 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):801:801 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():808:808 -> a
+    1:1:void visitEnd():821:821 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.Rl:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind EXACTLY_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_MOST_ONCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> c
-    1:1:void <init>(java.lang.String,int):812:812 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.wl:
+    1:1:void <init>(java.lang.String,int):864:864 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.Sl:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType CALLS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_NOT_NULL -> c
-    1:1:void <init>(java.lang.String,int):800:800 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.xl:
+    1:1:void <init>(java.lang.String,int):852:852 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.Tl:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):691:691 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):691:691 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():704:704 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():697:697 -> b
-    1:1:void visitEnd():710:710 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.zl:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):743:743 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):743:743 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():756:756 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():749:749 -> b
+    1:1:void visitEnd():762:762 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.Vl:
 # {"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>
     1:1:boolean equals(java.lang.Object):33:33 -> equals
     1:1:int hashCode():36:36 -> hashCode
-    2:2:int com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.hashCode():85:85 -> hashCode
+    2:2:int com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.hashCode():90:90 -> hashCode
     2:2:int hashCode():36 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
     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
@@ -58205,16 +58484,16 @@
     31:31:java.lang.String toString():39:39 -> toString
     32:32:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):28:28 -> toString
     32:32:java.lang.String toString():39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Wl:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Bl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Xl:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):947:947 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():947:947 -> a
-    1:1:java.lang.String getTypeFlexibilityId():947:947 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Cl:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):1001:1001 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():1001:1001 -> a
+    1:1:java.lang.String getTypeFlexibilityId():1001:1001 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Yl:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     java.util.List versionRequirements -> f
@@ -58225,102 +58504,102 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract contract -> g
     java.util.List extensions -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType returnType -> e
-    1:693:void <init>(int,java.lang.String):293:985 -> <init>
-    694:1355:void <init>(int,java.lang.String):325:986 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):328:328 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):331:331 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):334:334 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():343:343 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):346:346 -> a
-    6:628:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:354 -> a
-    629:1251:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):355:977 -> a
-    1252:1875:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):356:979 -> a
-    1876:2499:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):358:981 -> a
-    2500:2500:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360:360 -> a
-    2501:2501:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor.getType():119:119 -> a
-    2501:2501:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360 -> a
-    2502:2503:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360:361 -> a
-    2504:2504:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):357:357 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):337:337 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():340:340 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract getContract():322:322 -> d
-    1:1:int getFlags():291:291 -> e
-    1:1:java.lang.String getName():292:292 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReceiverParameterType():302:302 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReturnType():312:312 -> h
-    1:1:java.util.List getTypeParameters():297:297 -> i
-    1:1:java.util.List getValueParameters():307:307 -> j
-    1:1:java.util.List getVersionRequirements():317:317 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.El:
+    1:708:void <init>(int,java.lang.String):333:1040 -> <init>
+    709:1382:void <init>(int,java.lang.String):365:1038 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):368:368 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):371:371 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):374:374 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():383:383 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):386:386 -> a
+    6:643:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):394:394 -> a
+    644:1281:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):395:1032 -> a
+    1282:1920:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):396:1034 -> a
+    1921:2559:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):398:1036 -> a
+    2560:2560:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):400:400 -> a
+    2561:2561:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor.getType():119:119 -> a
+    2561:2561:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):400 -> a
+    2562:2563:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):400:401 -> a
+    2564:2564:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):397:397 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):377:377 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():380:380 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract getContract():362:362 -> d
+    1:1:int getFlags():331:331 -> e
+    1:1:java.lang.String getName():332:332 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReceiverParameterType():342:342 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReturnType():352:352 -> h
+    1:1:java.util.List getTypeParameters():337:337 -> i
+    1:1:java.util.List getValueParameters():347:347 -> j
+    1:1:java.util.List getVersionRequirements():357:357 -> k
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.am:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Fl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.bm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):248:248 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):248:248 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):259:259 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):267:267 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):276:276 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():296:296 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):304:304 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):284:284 -> b
-    2:2:void visitEnd():310:310 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():290:290 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Gl:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):284:284 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):284:284 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):295:295 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):303:303 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):312:312 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():332:332 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):340:340 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):320:320 -> b
+    2:2:void visitEnd():346:346 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():326:326 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.cm:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
-    1:1:void <init>():223:223 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):230:230 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.Hl:
+    1:1:void <init>():263:263 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):270:270 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.dm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):187:187 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):187:187 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
-    2:2:void visitEnd():201:201 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.Il:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):223:223 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):223:223 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):231:231 -> a
+    2:2:void visitEnd():237:237 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.em:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
     java.util.List typeAliases -> d
     java.util.List properties -> c
-    1:811:void <init>():175:985 -> <init>
-    812:1606:void <init>():192:986 -> <init>
+    1:866:void <init>():175:1040 -> <init>
+    867:1713:void <init>():192:1038 -> <init>
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getFunctions():179:179 -> a
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):212 -> a
-    2:2:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):975:975 -> a
+    2:2:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):1029:1029 -> a
     3:3:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):212:212 -> a
     4:4:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getProperties():184:184 -> a
     4:4:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):213 -> a
-    5:5:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):977:977 -> a
+    5:5:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):1032:1032 -> a
     6:6:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):213:213 -> a
     7:7:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getTypeAliases():189:189 -> a
     7:7:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):214 -> a
-    8:8:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):979:979 -> a
-    9:776:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):214:981 -> a
-    777:777:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215:215 -> a
-    778:778:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor.getType():92:92 -> a
-    778:778:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215 -> a
-    779:780:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215:216 -> a
-    781:781:java.util.List getProperties():184:184 -> a
-    782:782:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
-    783:783:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getFunctions():179:179 -> a
-    783:783:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195 -> a
-    784:784:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
-    785:785:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
-    786:786:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getProperties():184:184 -> a
-    786:786:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198 -> a
-    787:787:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
-    788:788:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):204:204 -> a
+    8:8:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):1034:1034 -> a
+    9:831:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):214:1036 -> a
+    832:832:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215:215 -> a
+    833:833:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor.getType():92:92 -> a
+    833:833:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215 -> a
+    834:835:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215:216 -> a
+    836:836:java.util.List getProperties():184:184 -> a
+    837:837:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
+    838:838:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getFunctions():179:179 -> a
+    838:838:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195 -> a
+    839:839:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
+    840:840:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
+    841:841:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getProperties():184:184 -> a
+    841:841:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198 -> a
+    842:842:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
+    843:843:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):204:204 -> a
     1:1:java.util.List getTypeAliases():189:189 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
     3:3:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage.getTypeAliases():189:189 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
     1:1:java.util.List getFunctions():179:179 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.Kl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.gm:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.Ll:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.hm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):162:162 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):162:162 -> <init>
@@ -58328,7 +58607,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():164:164 -> e
     1:1:void visitEnd():178 -> e
     2:2:void visitEnd():178:178 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.Ml:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.im:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> d
@@ -58340,46 +58619,46 @@
     int flags -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType returnType -> e
     java.util.List extensions -> g
-    1:604:void <init>(int,java.lang.String,int,int):380:983 -> <init>
-    605:1182:void <init>(int,java.lang.String,int,int):407:984 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):410:410 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):413:413 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):416:416 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):425:425 -> a
-    5:548:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):433:433 -> a
-    549:1092:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):434:977 -> a
-    1093:1635:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):437:979 -> a
-    1636:1636:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438:438 -> a
-    1637:1637:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor.getType():165:165 -> a
-    1637:1637:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438 -> a
-    1638:1639:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):438:439 -> a
-    1640:1640:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):436:436 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):419:419 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():422:422 -> b
-    1:1:int getFlags():376:376 -> c
-    1:1:int getGetterFlags():378:378 -> d
-    1:1:java.lang.String getName():377:377 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReceiverParameterType():389:389 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReturnType():399:399 -> g
-    1:1:int getSetterFlags():379:379 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():394:394 -> i
-    1:1:java.util.List getTypeParameters():384:384 -> j
-    1:1:java.util.List getVersionRequirements():404:404 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.Ol:
+    1:619:void <init>(int,java.lang.String,int,int):420:1038 -> <init>
+    620:1209:void <init>(int,java.lang.String,int,int):447:1036 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):450:450 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):453:453 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):456:456 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):465:465 -> a
+    5:563:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):473:473 -> a
+    564:1122:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):474:1032 -> a
+    1123:1680:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):477:1034 -> a
+    1681:1681:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):478:478 -> a
+    1682:1682:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor.getType():165:165 -> a
+    1682:1682:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):478 -> a
+    1683:1684:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):478:479 -> a
+    1685:1685:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):476:476 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):459:459 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():462:462 -> b
+    1:1:int getFlags():416:416 -> c
+    1:1:int getGetterFlags():418:418 -> d
+    1:1:java.lang.String getName():417:417 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReceiverParameterType():429:429 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReturnType():439:439 -> g
+    1:1:int getSetterFlags():419:419 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():434:434 -> i
+    1:1:java.util.List getTypeParameters():424:424 -> j
+    1:1:java.util.List getVersionRequirements():444:444 -> k
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.km:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.Pl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.lm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):320:320 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):320:320 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):331:331 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):339:339 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):348:348 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):370:370 -> a
-    5:5:void visitEnd():376:376 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):356:356 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():362:362 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.Ql:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):356:356 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):356:356 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):367:367 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):375:375 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):384:384 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):406:406 -> a
+    5:5:void visitEnd():412:412 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):392:392 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():398:398 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.mm:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
     int flags -> h
@@ -58388,75 +58667,85 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType abbreviatedType -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType outerType -> e
     java.util.List extensions -> g
-    1:388:void <init>(int):594:981 -> <init>
-    389:735:void <init>(int):636:982 -> <init>
-    1:668:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.KmType.visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):0:667 -> a
-    1:668:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):594 -> a
-    669:669:void visitClass(java.lang.String):639:639 -> a
-    670:670:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):651:651 -> a
-    671:671:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):658:658 -> a
-    672:672:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):664:664 -> a
-    673:973:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):675:975 -> a
-    974:979:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):681:686 -> a
-    980:980:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):685:685 -> a
-    981:981:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    981:981:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):685 -> a
-    982:1274:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):685:977 -> a
-    1275:1275:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):692:692 -> a
-    1276:1276:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor.getType():307:307 -> a
-    1276:1276:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):692 -> a
-    1277:1278:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):692:693 -> a
-    1279:1279:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):675:675 -> a
-    1:1:void visitTypeAlias(java.lang.String):643:643 -> b
-    2:2:void visitStarProjection():654:654 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):661:661 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):667:667 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getAbbreviatedType():614:614 -> c
-    2:2:void visitTypeParameter(int):647:647 -> c
-    1:1:java.util.List getArguments():603:603 -> d
-    1:1:int getFlags():594:594 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():633:633 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():626:626 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.Rl:
+    1:389:void <init>(int):648:1036 -> <init>
+    390:734:void <init>(int):690:1034 -> <init>
+    1:722:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.KmType.visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):0:721 -> a
+    1:722:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):648 -> a
+    723:723:void visitClass(java.lang.String):693:693 -> a
+    724:724:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):705:705 -> a
+    725:725:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):712:712 -> a
+    726:726:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):718:718 -> a
+    727:1028:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):729:1030 -> a
+    1029:1034:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):735:740 -> a
+    1035:1035:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):739:739 -> a
+    1036:1036:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    1036:1036:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):739 -> a
+    1037:1330:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):739:1032 -> a
+    1331:1331:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):746:746 -> a
+    1332:1332:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor.getType():307:307 -> a
+    1332:1332:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):746 -> a
+    1333:1334:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):746:747 -> a
+    1335:1335:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):729:729 -> a
+    1:1:void visitTypeAlias(java.lang.String):697:697 -> b
+    2:2:void visitStarProjection():708:708 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):715:715 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):721:721 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getAbbreviatedType():668:668 -> c
+    2:2:void visitTypeParameter(int):701:701 -> c
+    1:1:java.util.List getArguments():657:657 -> d
+    1:1:int getFlags():648:648 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():687:687 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():680:680 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.nm:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
-    java.lang.String name -> h
+    java.lang.String name -> i
     java.util.List versionRequirements -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType underlyingType -> c
     java.util.List annotations -> e
-    int flags -> g
+    int flags -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType expandedType -> d
-    1:26:void <init>(int,java.lang.String):452:477 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):480:480 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):486:486 -> a
-    3:3:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):489:489 -> a
-    4:479:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):501:501 -> a
-    480:955:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):502:977 -> a
-    956:1431:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):504:979 -> a
-    1432:1433:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):505:506 -> a
-    1434:1434:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):503:503 -> a
-    1435:1435:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):502:502 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):483:483 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():493:493 -> b
-    1:1:java.util.List getAnnotations():472:472 -> c
-    1:1:int getFlags():450:450 -> d
-    1:1:java.lang.String getName():451:451 -> e
-    1:1:java.util.List getTypeParameters():456:456 -> f
-    1:1:java.util.List getVersionRequirements():477:477 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.Sl:
+    java.util.List extensions -> g
+    1:549:void <init>(int,java.lang.String):492:1040 -> <init>
+    550:1068:void <init>(int,java.lang.String):520:1038 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):523:523 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):529:529 -> a
+    3:3:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):532:532 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):536:536 -> a
+    5:489:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):547:547 -> a
+    490:974:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):548:1032 -> a
+    975:1459:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):550:1034 -> a
+    1460:1945:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):551:1036 -> a
+    1946:1946:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):552:552 -> a
+    1947:1947:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor.getType():359:359 -> a
+    1947:1947:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):552 -> a
+    1948:1949:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):552:553 -> a
+    1950:1950:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):549:549 -> a
+    1951:1951:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):548:548 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):526:526 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():539:539 -> b
+    1:1:java.util.List getAnnotations():512:512 -> c
+    1:1:int getFlags():490:490 -> d
+    1:1:java.lang.String getName():491:491 -> e
+    1:1:java.util.List getTypeParameters():496:496 -> f
+    1:1:java.util.List getVersionRequirements():517:517 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.pm:
+# {"id":"sourceFile","fileName":"extensions.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.qm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):386:386 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):386:386 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):397:397 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):414:414 -> a
-    3:3:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):422:422 -> a
-    4:4:void visitEnd():435:435 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):405:405 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.Ul:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):422:422 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):422:422 -> <init>
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):433:433 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):450:450 -> a
+    3:3:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):458:458 -> a
+    4:4:void visitEnd():479:479 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):441:441 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():465:465 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.sm:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.Vl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.tm:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> b
     java.util.List extensions -> c
@@ -58464,309 +58753,321 @@
     int flags -> d
     java.lang.String name -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> g
-    1:420:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):562:981 -> <init>
-    421:834:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):569:982 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):572:572 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):575:575 -> a
-    3:396:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):583:583 -> a
-    397:791:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):584:584 -> a
-    792:792:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor.getType():271:271 -> a
-    792:792:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):584 -> a
-    793:794:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):584:585 -> a
-    1:1:int getFlags():558:558 -> b
-    1:1:int getId():560:560 -> c
-    1:1:java.lang.String getName():559:559 -> d
-    1:1:java.util.List getUpperBounds():566:566 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():561:561 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Xl:
+    1:421:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):616:1036 -> <init>
+    422:833:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):623:1034 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):626:626 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):629:629 -> a
+    3:396:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):637:637 -> a
+    397:792:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):638:638 -> a
+    793:793:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor.getType():271:271 -> a
+    793:793:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):638 -> a
+    794:795:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):638:639 -> a
+    1:1:int getFlags():612:612 -> b
+    1:1:int getId():614:614 -> c
+    1:1:java.lang.String getName():613:613 -> d
+    1:1:java.util.List getUpperBounds():620:620 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():615:615 -> f
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.vm:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.Yl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.wm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):475:475 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):475:475 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):527:527 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):527:527 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):482:482 -> a
-    2:2:void visitEnd():496:496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.Zl:
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):534:534 -> a
+    2:2:void visitEnd():548:548 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.xm:
 # {"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
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection STAR -> c
-    1:1:void <clinit>():936:936 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):929:929 -> <init>
+    1:1:void <clinit>():990:990 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):983:983 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance component1() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType component2() -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():929:929 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():929:929 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.am:
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():983:983 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():983:983 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.ym:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):511:511 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):511:511 -> <init>
-    1:1:void visitClass(java.lang.String):518:518 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):548:548 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):570:570 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):596:596 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):604:604 -> a
-    6:6:void visitEnd():610:610 -> a
-    1:1:void visitTypeAlias(java.lang.String):528:528 -> b
-    2:2:void visitStarProjection():555:555 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):585:585 -> b
-    1:1:void visitTypeParameter(int):537:537 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.bm:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):563:563 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):563:563 -> <init>
+    1:1:void visitClass(java.lang.String):570:570 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):600:600 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):622:622 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):648:648 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):656:656 -> a
+    6:6:void visitEnd():662:662 -> a
+    1:1:void visitTypeAlias(java.lang.String):580:580 -> b
+    2:2:void visitStarProjection():607:607 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):637:637 -> b
+    1:1:void visitTypeParameter(int):589:589 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.zm:
 # {"id":"sourceFile","fileName":"nodes.kt"}
+    java.lang.String name -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType varargElementType -> c
-    int flags -> d
-    java.lang.String name -> e
-    1:1:void <init>(int,java.lang.String):519:519 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):531:531 -> a
-    2:4:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):542:544 -> a
-    1:1:int getFlags():517:517 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):534:534 -> b
-    1:1:java.lang.String getName():518:518 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():523:523 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():528:528 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.cm:
+    java.util.List extensions -> d
+    int flags -> e
+    1:469:void <init>(int,java.lang.String):566:1034 -> <init>
+    470:924:void <init>(int,java.lang.String):578:1032 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):581:581 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):587:587 -> a
+    3:438:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):595:1030 -> a
+    439:439:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):597:597 -> a
+    440:440:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor.getType():386:386 -> a
+    440:440:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):597 -> a
+    441:442:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):597:598 -> a
+    1:1:int getFlags():564:564 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):584:584 -> b
+    1:1:java.lang.String getName():565:565 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():570:570 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():575:575 -> e
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.Bm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):445:445 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):445:445 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):452:452 -> a
-    2:2:void visitEnd():466:466 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):460:460 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.dm:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):489:489 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):489:489 -> <init>
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):496:496 -> a
+    2:2:void visitEnd():518:518 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):504:504 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.Cm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> c
-    1:1:void <init>(java.lang.String,int):777:777 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.em:
+    1:1:void <init>(java.lang.String,int):829:829 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.Dm:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
     int major -> a
-    1:1:void <init>(int,int,int):956:956 -> <init>
-    1:1:int getMajor():956:956 -> a
-    1:1:int getMinor():956:956 -> b
-    1:1:int getPatch():956:956 -> c
-    1:1:java.lang.String toString():957:957 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.fm:
+    1:1:void <init>(int,int,int):1010:1010 -> <init>
+    1:1:int getMajor():1010:1010 -> a
+    1:1:int getMinor():1010:1010 -> b
+    1:1:int getPatch():1010:1010 -> c
+    1:1:java.lang.String toString():1011:1011 -> toString
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.Em:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     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 -> f
     java.lang.String message -> e
-    1:1:void <init>():703:703 -> <init>
-    1:4:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):730:733 -> a
-    5:5:void visitVersion(int,int,int):737:737 -> a
-    6:8:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:748 -> a
-    9:9:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):747:747 -> a
-    10:10:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:746 -> a
-    1:1:java.lang.Integer getErrorCode():717:717 -> b
-    1:1:java.lang.String getMessage():722:722 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.gm:
+    1:1:void <init>():757:757 -> <init>
+    1:4:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):784:787 -> a
+    5:5:void visitVersion(int,int,int):791:791 -> a
+    6:8:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):800:802 -> a
+    9:9:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):801:801 -> a
+    10:10:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):800:800 -> a
+    1:1:java.lang.Integer getErrorCode():771:771 -> b
+    1:1:java.lang.String getMessage():776:776 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.Fm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel[] $VALUES -> d
-    1:1:void <init>(java.lang.String,int):821:821 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.hm:
+    1:1:void <init>(java.lang.String,int):873:873 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.Gm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind LANGUAGE_VERSION -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind[] $VALUES -> d
-    1:1:void <init>(java.lang.String,int):830:830 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.im:
+    1:1:void <init>(java.lang.String,int):882:882 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.Hm:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor delegate -> a
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):622:622 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):622:622 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):674:674 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):674:674 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String) -> a
     void visitVersion(int,int,int) -> a
-    1:1:void visitEnd():651:651 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.Os:
+    1:1:void visitEnd():703:703 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.it:
 # {"id":"sourceFile","fileName":"nodes.kt"}
-    1:1:java.lang.Object addTo(java.lang.Object,java.util.Collection):971:971 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.v7:
+    1:1:java.lang.Object addTo(java.lang.Object,java.util.Collection):1025:1025 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.w7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
-    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):396:398 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):408:408 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):29:29 -> a
+    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List):413:415 -> <init>
+    4:4: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>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):425:425 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):36:36 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):408 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor visitConstructor(int):414:414 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):122:122 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):425 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor visitConstructor(int):431:431 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):129:129 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor visitConstructor(int):414 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):417:417 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):145:145 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor visitConstructor(int):431 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):434:434 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):152:152 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):417 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):420:420 -> a
-    8:8:void visitCompanionObject(java.lang.String):426:426 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):447:447 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitSupertype(int):411:411 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):434 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):437:437 -> a
+    8:8:void visitCompanionObject(java.lang.String):443:443 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):464:464 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitSupertype(int):428:428 -> b
+    2:2: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
     2:2: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
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitSupertype(int):411 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):423:423 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):241:241 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitSupertype(int):428 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):440:440 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):253:253 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):423 -> b
-    5:7:void visitEnumEntry(java.lang.String):434:434 -> b
-    1:4:void visit(int,java.lang.String):401:404 -> c
-    5:5:void visitNestedClass(java.lang.String):430:430 -> c
-    1:1:void visitSealedSubclass(java.lang.String):440:440 -> d
-    1:2:void visitEnd():452:453 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():444:444 -> f
-    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):271:271 -> f
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):440 -> b
+    5:7:void visitEnumEntry(java.lang.String):451:451 -> b
+    1:4:void visit(int,java.lang.String):418:421 -> c
+    5:5:void visitNestedClass(java.lang.String):447:447 -> c
+    1:1:void visitSealedSubclass(java.lang.String):457:457 -> d
+    1:2:void visitEnd():469:470 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():461:461 -> f
+    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 -> f
     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 -> f
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():444 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():398:398 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():397:397 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.m7:
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():461 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():415:415 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():414:414 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.n7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:416:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):0:414 -> a
-    2:416:java.lang.Object invoke(java.lang.Object):396 -> a
-    417:417:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.n7:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> 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):413 -> a
+    434:434:java.lang.Object invoke(java.lang.Object):413:413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.o7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:450:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:448 -> a
-    2:450:java.lang.Object invoke(java.lang.Object):396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.o7:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> a
+    2:467:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:465 -> a
+    2:467:java.lang.Object invoke(java.lang.Object):413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.p7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:419:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:417 -> a
-    2:419:java.lang.Object invoke(java.lang.Object):396 -> a
-    420:420:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.p7:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> 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):413 -> a
+    437:437:java.lang.Object invoke(java.lang.Object):413:413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.q7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:422:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:420 -> a
-    2:422:java.lang.Object invoke(java.lang.Object):396 -> a
-    423:423:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.q7:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> 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):413 -> a
+    440:440:java.lang.Object invoke(java.lang.Object):413:413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.r7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:413:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:411 -> a
-    2:413:java.lang.Object invoke(java.lang.Object):396 -> a
-    414:414:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.r7:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> 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):413 -> a
+    431:431:java.lang.Object invoke(java.lang.Object):413:413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.s7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:425:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:423 -> a
-    2:425:java.lang.Object invoke(java.lang.Object):396 -> a
-    426:426:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.s7:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> 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):413 -> a
+    443:443:java.lang.Object invoke(java.lang.Object):413:413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.t7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:410:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:408 -> a
-    2:410:java.lang.Object invoke(java.lang.Object):396 -> a
-    411:411:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.t7:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> 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):413 -> a
+    428:428:java.lang.Object invoke(java.lang.Object):413:413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.u7:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1.invoke(int):444:444 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):396 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.mo:
+    1:1:java.lang.Object invoke(java.lang.Object):413:413 -> a
+    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1.invoke(int):461:461 -> a
+    2:2:java.lang.Object invoke(java.lang.Object):413 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):413:413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.Jo:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
-    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):483:485 -> <init>
-    1:1:void setT(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):484:484 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):488:488 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):145:145 -> a
+    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):525:527 -> <init>
+    1:1:void setT(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):526:526 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):530:530 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):152:152 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):488 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():485:485 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():484:484 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.lo:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):530 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():527:527 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():526:526 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.Io:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):483:483 -> a
-    2:490:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:488 -> a
-    2:490:java.lang.Object invoke(java.lang.Object):483 -> a
-    491:491:java.lang.Object invoke(java.lang.Object):483:483 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.iv:
+    1:1:java.lang.Object invoke(java.lang.Object):525:525 -> a
+    2:532: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:530 -> a
+    2:532:java.lang.Object invoke(java.lang.Object):525 -> a
+    533:533:java.lang.Object invoke(java.lang.Object):525:525 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.Cv:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
-    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):458:460 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):463:463 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):145:145 -> a
+    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List):475:477 -> <init>
+    4:4: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):475:475 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):480:480 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):152:152 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):463 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):466:466 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):472:472 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):469:469 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):241:241 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):480 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):483:483 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):489:489 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):486:486 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):253:253 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):469 -> b
-    1:2:void visitEnd():477:478 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():460:460 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():459:459 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.ev:
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):486 -> b
+    1:2:void visitEnd():494:495 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():477:477 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():476:476 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.yv:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
-    1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
-    2:475:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:473 -> a
-    2:475:java.lang.Object invoke(java.lang.Object):458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.fv:
+    1:1:java.lang.Object invoke(java.lang.Object):475:475 -> a
+    2:492:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:490 -> a
+    2:492:java.lang.Object invoke(java.lang.Object):475 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.zv:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
-    2:465:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:463 -> a
-    2:465:java.lang.Object invoke(java.lang.Object):458 -> a
-    466:466:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.gv:
+    1:1:java.lang.Object invoke(java.lang.Object):475:475 -> a
+    2:482: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:480 -> a
+    2:482:java.lang.Object invoke(java.lang.Object):475 -> a
+    483:483:java.lang.Object invoke(java.lang.Object):475:475 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.Av:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
-    2:468:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:466 -> a
-    2:468:java.lang.Object invoke(java.lang.Object):458 -> a
-    469:469:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.hv:
+    1:1:java.lang.Object invoke(java.lang.Object):475:475 -> a
+    2:485: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:483 -> a
+    2:485:java.lang.Object invoke(java.lang.Object):475 -> a
+    486:486:java.lang.Object invoke(java.lang.Object):475:475 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.Bv:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
-    2:471:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:469 -> a
-    2:471:java.lang.Object invoke(java.lang.Object):458 -> a
-    472:472:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.Iy:
+    1:1:java.lang.Object invoke(java.lang.Object):475:475 -> a
+    2:488: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:486 -> a
+    2:488:java.lang.Object invoke(java.lang.Object):475 -> a
+    489:489:java.lang.Object invoke(java.lang.Object):475:475 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.az:
 # {"id":"sourceFile","fileName":"readers.kt"}
-    java.util.List extensions -> a
-    java.util.Map typeParameterNameToId -> b
+    java.util.Map typeParameterNameToId -> a
+    java.util.List extensions -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext parent -> f
+    java.util.List contextExtensions -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver strings -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable versionRequirements -> e
-    1:8:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):14:21 -> <init>
-    1:1:java.util.List getExtensions$kotlinx_metadata():20:20 -> a
-    2:2:java.lang.String className(int):27:27 -> a
-    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext withTypeParameters(java.util.List):33:35 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver getStrings():15:15 -> b
-    2:2:java.lang.String get(int):24:24 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():16:16 -> c
-    2:2:java.lang.Integer getTypeParameterId(int):30:30 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():17:17 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.Jy:
+    1:10:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,java.util.List):20:29 -> <init>
+    11:11:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
+    1:1:java.util.List getExtensions$kotlinx_metadata():29:29 -> a
+    2:2:java.lang.String className(int):35:35 -> a
+    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext withTypeParameters(java.util.List):41:43 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver getStrings():21:21 -> b
+    2:2:java.lang.String get(int):32:32 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():22:22 -> c
+    2:2:java.lang.Integer getTypeParameterId(int):38:38 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():23:23 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.bz:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     1:52:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):18:69 -> a
     53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):68:68 -> a
@@ -58780,540 +59081,563 @@
     66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):31:31 -> a
     67:67:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):30:30 -> a
     68:90:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):29:51 -> a
-    91:122:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:81 -> a
-    123:123:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):80:80 -> a
-    124:155:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
-    156:156:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):49:49 -> a
-    157:157:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):48:48 -> a
-    158:158:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:47 -> a
-    159:159:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
-    160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
-    161:161:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
-    162:162:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
-    163:163:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):42:42 -> a
-    164:164:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
-    165:165:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
-    166:166:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):39:39 -> a
-    167:167:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
-    168:168:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56:56 -> a
-    169:169:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):72:72 -> a
-    169:169:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56 -> a
-    170:170:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.Ky:
+    91:123:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:82 -> a
+    124:124:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):81:81 -> a
+    125:157:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
+    158:158:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):49:49 -> a
+    159:159:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):48:48 -> a
+    160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:47 -> a
+    161:161:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
+    162:162:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
+    163:163:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
+    164:164:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
+    165:165:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):42:42 -> a
+    166:166:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
+    167:167:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
+    168:168:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):39:39 -> a
+    169:169:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
+    170:170:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56:56 -> a
+    171:171:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):74:74 -> a
+    171:171:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):56 -> a
+    172:172:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57:57 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.cz:
 # {"id":"sourceFile","fileName":"readers.kt"}
-    1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
-    2:2:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):41 -> a
-    3:398:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):42:437 -> a
-    399:399:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):436:436 -> a
-    400:400:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):435:435 -> a
-    401:401:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    401:401:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    401:401:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):440 -> a
-    402:402:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):440:440 -> a
-    403:796:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):47:440 -> a
-    797:797:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):434:434 -> a
-    798:798:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:50 -> a
-    799:912:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:113 -> a
-    799:912:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50 -> a
-    913:913:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):24:24 -> a
-    913:913:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50 -> a
-    914:919:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):50:55 -> a
-    920:929:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):132:141 -> a
-    920:929:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    930:1017:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:87 -> a
-    930:1017:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
-    930:1017:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1018:1074:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
-    1018:1074:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):87 -> a
-    1018:1074:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
-    1018:1074:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1075:1075:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):87:87 -> a
-    1075:1075:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):141 -> a
-    1075:1075:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1076:1076:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):144:144 -> a
-    1076:1076:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):55 -> a
-    1077:1091:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):58:72 -> a
-    1092:1092:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70:70 -> a
-    1093:1093:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    1093:1093:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70 -> a
-    1094:1108:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):70:84 -> a
-    1109:1137:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:28 -> a
-    1109:1137:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):84 -> a
-    1138:1145:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):27:34 -> a
-    1138:1145:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):84 -> a
-    1146:1146:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):87:87 -> a
-    1147:1147:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):91:91 -> a
-    1148:1148:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
-    1148:1148:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):91 -> a
-    1149:1152:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):93:96 -> a
-    1153:1195:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:42 -> a
-    1153:1195:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):96 -> a
-    1196:1203:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):41:48 -> a
-    1196:1203:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):96 -> a
-    1204:1204:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):99:99 -> a
-    1205:1211:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):108:114 -> a
-    1212:1218:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):113:119 -> a
-    1219:1467:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):213:461 -> a
-    1219:1467:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1468:1468:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):460:460 -> a
-    1468:1468:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1469:1469:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):459:459 -> a
-    1469:1469:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1470:1470:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    1470:1470:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    1470:1470:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):464 -> a
-    1470:1470:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1471:1471:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):464:464 -> a
-    1471:1471:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1472:1720:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):216:464 -> a
-    1472:1720:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1721:1721:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):458:458 -> a
-    1721:1721:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1722:1722:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219:219 -> a
-    1722:1722:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1723:1818:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:95 -> a
-    1723:1818:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219 -> a
-    1723:1818:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1819:1822:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):220:223 -> a
-    1819:1822:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1823:1924:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:101 -> a
-    1823:1924:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):223 -> a
-    1823:1924:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1925:1936:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):224:235 -> a
-    1925:1936:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1937:1937:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):102:102 -> a
-    1937:1937:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):223 -> a
-    1937:1937:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1938:1938:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):96:96 -> a
-    1938:1938:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):219 -> a
-    1938:1938:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):119 -> a
-    1939:1939:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124:124 -> a
-    1940:1940:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.getEMPTY():15:15 -> a
-    1940:1940:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124 -> a
-    1941:1941:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):18:18 -> a
-    1941:1941:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):124 -> a
-    1942:1944:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:128 -> a
-    1945:2242:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):148:445 -> a
-    2243:2243:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):444:444 -> a
-    2244:2244:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):443:443 -> a
-    2245:2245:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    2245:2245:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    2245:2245:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):448 -> a
-    2246:2246:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):448:448 -> a
-    2247:2544:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):151:448 -> a
-    2545:2545:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):442:442 -> a
-    2546:2546:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):154:154 -> a
-    2547:2548:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    2547:2548:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):155 -> a
-    2549:2561:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):155:167 -> a
-    2562:2568:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):354:360 -> a
-    2562:2568:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2569:2569:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):359:359 -> a
-    2569:2569:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2570:2578:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):358:366 -> a
-    2570:2578:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2579:2579:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):365:365 -> a
-    2579:2579:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2580:2585:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):364:369 -> a
-    2580:2585:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2586:2594:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):376:384 -> a
-    2586:2594:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):369 -> a
-    2586:2594:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2595:2595:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):363:363 -> a
-    2595:2595:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2596:2611:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):357:372 -> a
-    2596:2611:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):167 -> a
-    2612:2617:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):170:175 -> a
-    2618:2671:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:53 -> a
-    2618:2671:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
-    2672:2728:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
-    2672:2728:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):53 -> a
-    2672:2728:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
-    2729:2736:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):53:60 -> a
-    2729:2736:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):175 -> a
-    2737:2737:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):178:178 -> a
-    2738:3009:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):182:453 -> a
-    3010:3010:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):452:452 -> a
-    3011:3011:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):451:451 -> a
-    3012:3012:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):423:423 -> a
-    3012:3012:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
-    3012:3012:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):456 -> a
-    3013:3013:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):456:456 -> a
-    3014:3285:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):185:456 -> a
-    3286:3286:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):450:450 -> a
-    3287:3287:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):188:188 -> a
-    3288:3353:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:65 -> a
-    3288:3353:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):188 -> a
-    3354:3355:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    3354:3355:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):189 -> a
-    3356:3373:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):189:206 -> a
-    3374:3446:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:72 -> a
-    3374:3446:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3447:3504:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):0:57 -> a
-    3447:3504:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):73 -> a
-    3447:3504:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3505:3506:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):74:75 -> a
-    3505:3506:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3507:3518:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):71:82 -> a
-    3507:3518:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):206 -> a
-    3519:3519:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):209:209 -> a
-    3520:3524:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):239:243 -> a
-    3525:3602:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:77 -> a
-    3525:3602:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):243 -> a
-    3603:3604:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    3603:3604:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):244 -> a
-    3605:3608:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):244:247 -> a
-    3609:3609:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264:264 -> a
-    3609:3609:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3610:3727:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:117 -> a
-    3610:3727:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264 -> a
-    3610:3727:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3728:3728:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):39:39 -> a
-    3728:3728:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264 -> a
-    3728:3728:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3729:3734:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):264:269 -> a
-    3729:3734:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3735:3830:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:95 -> a
-    3735:3830:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
-    3735:3830:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3831:3831:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):272:272 -> a
-    3831:3831:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
-    3832:3850:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):277:295 -> a
-    3851:3851:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):294:294 -> a
-    3852:3852:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):293:293 -> a
-    3853:3860:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):292:299 -> a
-    3861:3889:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:28 -> a
-    3861:3889:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):299 -> a
-    3890:3891:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    3890:3891:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):301 -> a
-    3892:3892:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):301:301 -> a
-    3893:3893:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300:300 -> a
-    3894:3894:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    3894:3894:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300 -> a
-    3895:3898:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):300:303 -> a
-    3899:3915:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):291:307 -> a
-    3916:4005:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:89 -> a
-    3916:4005:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):307 -> a
-    4006:4007:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4006:4007:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):308 -> a
-    4008:4011:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):308:311 -> a
-    4012:4095:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:83 -> a
-    4012:4095:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):311 -> a
-    4096:4097:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4096:4097:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):312 -> a
-    4098:4101:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):312:315 -> a
-    4102:4136:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:34 -> a
-    4102:4136:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):315 -> a
-    4137:4138:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4137:4138:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):317 -> a
-    4139:4139:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):318:318 -> a
-    4140:4147:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):316:323 -> a
-    4148:4252:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:104 -> a
-    4148:4252:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):323 -> a
-    4253:4253:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):326:326 -> a
-    4254:4258:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):282:286 -> a
-    4259:4259:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    4259:4259:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):286 -> a
-    4260:4260:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):286:286 -> a
-    4261:4261:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330:330 -> a
-    4262:4364:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):0:102 -> a
-    4262:4364:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4365:4369:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:65 -> a
-    4365:4369:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4365:4369:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4374:4378:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):70:70 -> a
-    4374:4378:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4374:4378:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4383:4383:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):75:75 -> a
-    4383:4383:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    4383:4383:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4384:4387:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:108 -> a
-    4384:4387:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4388:4388:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):107:107 -> a
-    4388:4388:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4389:4398:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):106:115 -> a
-    4389:4398:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4399:4399:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:105 -> a
-    4399:4399:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330 -> a
-    4400:4403:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):333:336 -> a
-    4404:4404:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):335:335 -> a
-    4405:4413:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):334:342 -> a
-    4414:4414:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):341:341 -> a
-    4415:4425:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):340:350 -> a
-    4426:4426:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331:331 -> a
-    4427:4427:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    4427:4427:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331 -> a
-    4428:4428:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):331:331 -> a
-    4429:4430:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):389:390 -> a
-    4431:4441:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388:398 -> a
-    4442:4442:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):397:397 -> a
-    4443:4443:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):396:396 -> a
-    4444:4453:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):394:403 -> a
-    4454:4561:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:107 -> a
-    4454:4561:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):403 -> a
-    4562:4563:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4562:4563:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):404 -> a
-    4564:4575:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):404:415 -> a
-    4576:4577:int getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):419:420 -> a
-    4578:4578:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):426:426 -> a
-    4579:4579:int getDefaultPropertyAccessorFlags(int):432:432 -> a
-    1:1:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.bH:
+    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):51:51 -> a
+    2:58: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:56 -> a
+    2:58: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):51 -> a
+    59:501: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):53:495 -> a
+    59:501: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):51 -> a
+    502:502: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):494:494 -> a
+    502:502: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):51 -> a
+    503:503: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):493:493 -> a
+    503:503: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):51 -> a
+    504:504:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):481:481 -> a
+    504:504:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    504:504: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):498 -> a
+    504:504: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):51 -> a
+    505:505: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):498:498 -> a
+    505:505: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):51 -> a
+    506:941: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):63:498 -> a
+    506:941: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):51 -> a
+    942:942: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):66:66 -> a
+    942:942: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):51 -> a
+    943:1057:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:114 -> a
+    943:1057: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):66 -> a
+    943:1057: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):51 -> a
+    1058:1058:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):24:24 -> a
+    1058:1058: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):66 -> a
+    1058:1058: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):51 -> a
+    1059:1064: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):66:71 -> a
+    1059:1064: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):51 -> a
+    1065:1074:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):182:191 -> a
+    1065:1074: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):71 -> a
+    1065:1074: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):51 -> a
+    1075:1165:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:90 -> a
+    1075:1165:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):191 -> a
+    1075:1165: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):71 -> a
+    1075:1165: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):51 -> a
+    1166:1222:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
+    1166:1222:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):90 -> a
+    1166:1222:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):191 -> a
+    1166:1222: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):71 -> a
+    1166:1222: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):51 -> a
+    1223:1223:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):90:90 -> a
+    1223:1223:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):191 -> a
+    1223:1223: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):71 -> a
+    1223:1223: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):51 -> a
+    1224:1224:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):194:194 -> a
+    1224:1224: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):71 -> a
+    1224:1224: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):51 -> a
+    1225:1239: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):74:88 -> a
+    1225:1239: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):51 -> a
+    1240:1240: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):86:86 -> a
+    1240:1240: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):51 -> a
+    1241:1241:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    1241:1241: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):86 -> a
+    1241:1241: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):51 -> a
+    1242:1256: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):86:100 -> a
+    1242:1256: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):51 -> a
+    1257:1285:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:28 -> a
+    1257:1285: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):100 -> a
+    1257:1285: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):51 -> a
+    1286:1293:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):27:34 -> a
+    1286:1293: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):100 -> a
+    1286:1293: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):51 -> a
+    1294:1294: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):103:103 -> a
+    1294:1294: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):51 -> a
+    1295:1295:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):109:109 -> a
+    1296:1410:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List):0:114 -> a
+    1296:1410:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):109 -> a
+    1411:1421:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List):111:121 -> a
+    1411:1421:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):109 -> a
+    1422:1464:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:42 -> a
+    1422:1464:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List):121 -> a
+    1422:1464:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):109 -> a
+    1465:1472:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):41:48 -> a
+    1465:1472:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List):121 -> a
+    1465:1472:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):109 -> a
+    1473:1473:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List):124:124 -> a
+    1473:1473:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):109 -> a
+    1474:1480:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):158:164 -> a
+    1481:1487:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):163:169 -> a
+    1488:1752:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):263:527 -> a
+    1488:1752:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    1753:1753:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):526:526 -> a
+    1753:1753:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    1754:1754:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):525:525 -> a
+    1754:1754:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    1755:1755:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):481:481 -> a
+    1755:1755:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    1755:1755:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):530 -> a
+    1755:1755:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    1756:1756:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):530:530 -> a
+    1756:1756:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    1757:2021:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):266:530 -> a
+    1757:2021:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2022:2022:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269:269 -> a
+    2022:2022:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2023:2118:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:95 -> a
+    2023:2118:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
+    2023:2118:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2119:2122:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):270:273 -> a
+    2119:2122:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2123:2224:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:101 -> a
+    2123:2224:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):273 -> a
+    2123:2224:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2225:2237:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):274:286 -> a
+    2225:2237:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2238:2238:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.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):0:0 -> a
+    2238:2238:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):286 -> a
+    2238:2238:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2239:2239:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):289:289 -> a
+    2239:2239:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2240:2240:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):102:102 -> a
+    2240:2240:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):273 -> a
+    2240:2240:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2241:2241:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):96:96 -> a
+    2241:2241:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):269 -> a
+    2241:2241:void visitDeclarations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):169 -> a
+    2242:2242:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):174:174 -> a
+    2243:2243:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.getEMPTY():15:15 -> a
+    2243:2243:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):174 -> a
+    2244:2248:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):174:178 -> a
+    2249:2558:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):198:507 -> a
+    2559:2559:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):506:506 -> a
+    2560:2560:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):505:505 -> a
+    2561:2561:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):481:481 -> a
+    2561:2561:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    2561:2561:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):510 -> a
+    2562:2562:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):510:510 -> a
+    2563:2872:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):201:510 -> a
+    2873:2873:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):204:204 -> a
+    2874:2875:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    2874:2875:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):205 -> a
+    2876:2888:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):205:217 -> a
+    2889:2895:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):412:418 -> a
+    2889:2895:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):217 -> a
+    2896:2896:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):417:417 -> a
+    2896:2896:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):217 -> a
+    2897:2905:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):416:424 -> a
+    2897:2905:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):217 -> a
+    2906:2906:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):423:423 -> a
+    2906:2906:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):217 -> a
+    2907:2912:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):422:427 -> a
+    2907:2912:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):217 -> a
+    2913:2921:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):434:442 -> a
+    2913:2921:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):427 -> a
+    2913:2921:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):217 -> a
+    2922:2922:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):430:430 -> a
+    2922:2922:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):217 -> a
+    2923:2928:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):220:225 -> a
+    2929:2985:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:56 -> a
+    2929:2985:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):225 -> a
+    2986:3042:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):0:56 -> a
+    2986:3042:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):56 -> a
+    2986:3042:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):225 -> a
+    3043:3050:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):56:63 -> a
+    3043:3050:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):225 -> a
+    3051:3051:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):228:228 -> a
+    3052:3337:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):232:517 -> a
+    3338:3338:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):516:516 -> a
+    3339:3339:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):515:515 -> a
+    3340:3340:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):481:481 -> a
+    3340:3340:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.access$getTypeParameterFlags$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter):1 -> a
+    3340:3340:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):520 -> a
+    3341:3341:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):520:520 -> a
+    3342:3627:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):235:520 -> a
+    3628:3628:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):238:238 -> a
+    3629:3694:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:65 -> a
+    3629:3694:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):238 -> a
+    3695:3696:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    3695:3696:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):239 -> a
+    3697:3714:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):239:256 -> a
+    3715:3790:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:75 -> a
+    3715:3790:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):256 -> a
+    3791:3848:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):0:57 -> a
+    3791:3848:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):76 -> a
+    3791:3848:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):256 -> a
+    3849:3850:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):77:78 -> a
+    3849:3850:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):256 -> a
+    3851:3862:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readPropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):74:85 -> a
+    3851:3862:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):256 -> a
+    3863:3863:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):259:259 -> a
+    3864:3868:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):293:297 -> a
+    3869:3946:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:77 -> a
+    3869:3946:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):297 -> a
+    3947:3948:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    3947:3948:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):298 -> a
+    3949:3953:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):298:302 -> a
+    3954:3954:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readValueParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:0 -> a
+    3954:3954:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):302 -> a
+    3955:3955:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):305:305 -> a
+    3956:3956:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):322:322 -> a
+    3956:3956:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    3957:4075:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:118 -> a
+    3957:4075:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):322 -> a
+    3957:4075:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    4076:4076:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):39:39 -> a
+    4076:4076:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):322 -> a
+    4076:4076:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    4077:4082:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):322:327 -> a
+    4077:4082:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    4083:4181:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:98 -> a
+    4083:4181:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):327 -> a
+    4083:4181:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    4182:4182:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):330:330 -> a
+    4182:4182:void access$accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):1 -> a
+    4183:4201:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):335:353 -> a
+    4202:4202:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):352:352 -> a
+    4203:4203:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):351:351 -> a
+    4204:4211:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):350:357 -> a
+    4212:4240:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:28 -> a
+    4212:4240:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):357 -> a
+    4241:4242:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    4241:4242:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):359 -> a
+    4243:4243:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):359:359 -> a
+    4244:4244:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):358:358 -> a
+    4245:4245:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    4245:4245:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):358 -> a
+    4246:4253:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):358:365 -> a
+    4254:4343:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:89 -> a
+    4254:4343:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):365 -> a
+    4344:4345:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    4344:4345:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):366 -> a
+    4346:4349:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):366:369 -> a
+    4350:4433:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:83 -> a
+    4350:4433:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):369 -> a
+    4434:4435:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    4434:4435:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):370 -> a
+    4436:4439:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):370:373 -> a
+    4440:4474:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:34 -> a
+    4440:4474:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):373 -> a
+    4475:4476:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    4475:4476:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):375 -> a
+    4477:4477:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):376:376 -> a
+    4478:4485:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):374:381 -> a
+    4486:4593:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.readTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):0:107 -> a
+    4486:4593:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):381 -> a
+    4594:4594:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):384:384 -> a
+    4595:4599:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):340:344 -> a
+    4600:4600:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    4600:4600:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):344 -> a
+    4601:4601:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):344:344 -> a
+    4602:4602:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388:388 -> a
+    4603:4705:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):0:102 -> a
+    4603:4705:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388 -> a
+    4706:4710:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:65 -> a
+    4706:4710:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4706:4710:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388 -> a
+    4715:4719:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):70:70 -> a
+    4715:4719:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4715:4719:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388 -> a
+    4724:4724:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):75:75 -> a
+    4724:4724:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
+    4724:4724:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388 -> a
+    4725:4728:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):105:108 -> a
+    4725:4728:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388 -> a
+    4729:4729:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):107:107 -> a
+    4729:4729:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388 -> a
+    4730:4739:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable):106:115 -> a
+    4730:4739:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):388 -> a
+    4740:4743:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):391:394 -> a
+    4744:4744:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):393:393 -> a
+    4745:4753:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):392:400 -> a
+    4754:4754:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):399:399 -> a
+    4755:4765:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):398:408 -> a
+    4766:4766:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):389:389 -> a
+    4767:4767:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
+    4767:4767:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):389 -> a
+    4768:4768:void acceptVersionRequirementVisitor(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):389:389 -> a
+    4769:4770:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):447:448 -> a
+    4771:4781:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):446:456 -> a
+    4782:4782:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):455:455 -> a
+    4783:4783:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):454:454 -> a
+    4784:4793:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):452:461 -> a
+    4794:4901:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):0:107 -> a
+    4794:4901:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):461 -> a
+    4902:4903:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    4902:4903:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):462 -> a
+    4904:4915:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext):462:473 -> a
+    4916:4917:int getTypeFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):477:478 -> a
+    4918:4918:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):484:484 -> a
+    4919:4919:int getDefaultPropertyAccessorFlags(int):490:490 -> a
+    1:1:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):487:487 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.xH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> b
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):15:16 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable getStrings():15:15 -> a
-    2:2:int get(java.lang.String):19:19 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable getVersionRequirements():16:16 -> b
-    2:2:int getClassName(java.lang.String):22:22 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.cH:
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List):22:23 -> <init>
+    3:3: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):22:22 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable getStrings():22:22 -> a
+    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.yH:
 # {"id":"sourceFile","fileName":"writeUtils.kt"}
-    1:23:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt.isLocal(java.lang.String):0:22 -> a
-    1:23:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):109 -> a
-    24:26:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):110:112 -> a
-    27:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:22 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):20:20 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:17 -> a
-    35:110:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):28:28 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.ZH:
+    1:24:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt.isLocal(java.lang.String):0:23 -> a
+    1:24:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):109 -> a
+    25:27:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):110:112 -> a
+    28:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:22 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):20:20 -> a
+    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:17 -> a
+    36:111:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):28:28 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.xI:
 # {"id":"sourceFile","fileName":"writers.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor writeProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.gH:
+    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.CH:
 # {"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
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):122:123 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):126:126 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):220:220 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):129:130 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):133:133 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):227:227 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):126 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):132:132 -> a
-    4:7:void visitEnd():137:140 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():129:129 -> b
-    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):271:271 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):133 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):139:139 -> a
+    4:7:void visitEnd():144:147 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():136:136 -> b
+    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 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():129 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():123:123 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.dH:
+    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$visitExtensions$1 -> com.android.tools.r8.internal.zH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
-    2:135:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:133 -> a
-    2:135:java.lang.Object invoke(java.lang.Object):122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.eH:
+    1:1:java.lang.Object invoke(java.lang.Object):129:129 -> a
+    2:142:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:140 -> a
+    2:142:java.lang.Object invoke(java.lang.Object):129 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.AH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
-    2:128:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:126 -> a
-    2:128:java.lang.Object invoke(java.lang.Object):122 -> a
-    129:129:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.fH:
+    1:1:java.lang.Object invoke(java.lang.Object):129:129 -> a
+    2:135:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:133 -> a
+    2:135:java.lang.Object invoke(java.lang.Object):129 -> a
+    136:136:java.lang.Object invoke(java.lang.Object):129:129 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.BH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1.invoke(int):129:129 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):122 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.iH:
+    1:1:java.lang.Object invoke(java.lang.Object):129:129 -> 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):129 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):129:129 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.EH:
 # {"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
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):320:321 -> <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):324:324 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):334:334 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):337:338 -> <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):341:341 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):351:351 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):324 -> a
-    3:3:void visitEnd():327:327 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder getT():321:321 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.hH:
+    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.DH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):320:320 -> a
-    2:326:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):0:324 -> a
-    2:326:java.lang.Object invoke(java.lang.Object):320 -> a
-    327:327:java.lang.Object invoke(java.lang.Object):320:320 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.lH:
+    1:1:java.lang.Object invoke(java.lang.Object):337:337 -> 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):337 -> a
+    344:344:java.lang.Object invoke(java.lang.Object):337:337 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.HH:
 # {"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
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType $type -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind $invocationKind -> e
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):334:335 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():341:341 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):361:361 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):351:352 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():358:358 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):378:378 -> a
     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 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():341 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():338:338 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):361:361 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():358 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():355:355 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):378:378 -> b
     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 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():338 -> b
-    1:4:void visitEnd():345:348 -> c
-    5:5:void visitEnd():347:347 -> c
-    6:14:void visitEnd():346:354 -> c
-    15:15:void visitEnd():352:352 -> c
-    16:21:void visitEnd():351:356 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder getT():335:335 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.jH:
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():355 -> b
+    1:4:void visitEnd():362:365 -> c
+    5:5:void visitEnd():364:364 -> c
+    6:14:void visitEnd():363:371 -> c
+    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$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.FH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
-    2:343:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:341 -> a
-    2:343:java.lang.Object invoke(java.lang.Object):334 -> a
-    344:344:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.kH:
+    1:1:java.lang.Object invoke(java.lang.Object):351:351 -> a
+    2:360:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:358 -> a
+    2:360:java.lang.Object invoke(java.lang.Object):351 -> a
+    361:361:java.lang.Object invoke(java.lang.Object):351:351 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.GH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
-    2:340:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:338 -> a
-    2:340:java.lang.Object invoke(java.lang.Object):334 -> a
-    341:341:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.pH:
+    1:1:java.lang.Object invoke(java.lang.Object):351:351 -> 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):351 -> a
+    358:358:java.lang.Object invoke(java.lang.Object):351:351 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.LH:
 # {"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
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):361:362 -> <init>
-    1:5:void visit(int,java.lang.Integer):365:369 -> a
-    6:9:void visitConstantValue(java.lang.Object):375:378 -> a
-    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):383:383 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):378:379 -> <init>
+    1:5:void visit(int,java.lang.Integer):382:386 -> a
+    6:9:void visitConstantValue(java.lang.Object):392:395 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):400:400 -> a
+    11:11: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 -> a
     11:11: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 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):383 -> a
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():386:386 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):361:361 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int):400 -> a
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():403:403 -> a
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):378:378 -> a
     13:13: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 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():386 -> a
-    1:1:void visitEnd():392:392 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():389:389 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):361:361 -> c
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():403 -> a
+    1:1:void visitEnd():409:409 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():406:406 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):378:378 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():389 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder getT():362:362 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.mH:
+    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.IH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
-    2:388:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:386 -> a
-    2:388:java.lang.Object invoke(java.lang.Object):361 -> a
-    389:389:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.nH:
+    1:1:java.lang.Object invoke(java.lang.Object):378:378 -> 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):378 -> a
+    406:406:java.lang.Object invoke(java.lang.Object):378:378 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.JH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
-    2:385:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:383 -> a
-    2:385:java.lang.Object invoke(java.lang.Object):361 -> a
-    386:386:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.oH:
+    1:1:java.lang.Object invoke(java.lang.Object):378:378 -> 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):378 -> a
+    403:403:java.lang.Object invoke(java.lang.Object):378:378 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.KH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
-    2:391:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:389 -> a
-    2:391:java.lang.Object invoke(java.lang.Object):361 -> a
-    392:392:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.xH:
+    1:1:java.lang.Object invoke(java.lang.Object):378:378 -> 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):378 -> a
+    409:409:java.lang.Object invoke(java.lang.Object):378:378 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.TH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     java.lang.String $name -> d
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):145:146 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):149:149 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):29:29 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):152:153 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):156:156 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):36:36 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):149 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):152:152 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):156 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):159:159 -> a
+    4:4: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 -> a
     4:4: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 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):152 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):155:155 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):220:220 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):159 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):162:162 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):227:227 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):155 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():164:164 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):320:320 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):162 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():171:171 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):337:337 -> a
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():164 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):167:167 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):158:158 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():171 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):174:174 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):165:165 -> b
+    2:2: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
     2:2: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
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):158 -> b
-    3:7:void visitEnd():172:176 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():161:161 -> c
-    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):271:271 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):165 -> b
+    3:7:void visitEnd():179:183 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():168:168 -> c
+    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 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():161 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():146:146 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.qH:
+    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.MH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    2:166: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):0:164 -> a
-    2:166:java.lang.Object invoke(java.lang.Object):145 -> a
-    167:168:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23584:23585 -> a
-    167:168:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):164 -> a
-    167:168:java.lang.Object invoke(java.lang.Object):145 -> a
-    169:169:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):164:164 -> a
-    169:169:java.lang.Object invoke(java.lang.Object):145 -> a
-    170:170:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    171:171:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    171:171:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23586 -> a
-    171:171:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):164 -> a
-    171:171:java.lang.Object invoke(java.lang.Object):145 -> a
-    172:172:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23586:23586 -> a
-    172:172:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):164 -> a
-    172:172:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.rH:
+    1:1:java.lang.Object invoke(java.lang.Object):152:152 -> a
+    2:173: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):0:171 -> a
+    2:173:java.lang.Object invoke(java.lang.Object):152 -> a
+    174:175:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23608:23609 -> a
+    174:175: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
+    174:175:java.lang.Object invoke(java.lang.Object):152 -> a
+    176:176: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:171 -> a
+    176:176:java.lang.Object invoke(java.lang.Object):152 -> a
+    177:177:java.lang.Object invoke(java.lang.Object):152:152 -> a
+    178:178:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    178:178:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23610 -> a
+    178:178: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
+    178:178:java.lang.Object invoke(java.lang.Object):152 -> a
+    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():23610:23610 -> 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):152 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.NH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
-    1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    2:170:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:168 -> a
-    2:170:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.sH:
+    1:1:java.lang.Object invoke(java.lang.Object):152:152 -> 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):152 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.OH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    2:154:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:152 -> a
-    2:154:java.lang.Object invoke(java.lang.Object):145 -> a
-    155:155:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.tH:
+    1:1:java.lang.Object invoke(java.lang.Object):152:152 -> 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):152 -> a
+    162:162:java.lang.Object invoke(java.lang.Object):152:152 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.PH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    2:160:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:158 -> a
-    2:160:java.lang.Object invoke(java.lang.Object):145 -> a
-    161:161:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.uH:
+    1:1:java.lang.Object invoke(java.lang.Object):152:152 -> 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):152 -> a
+    168:168:java.lang.Object invoke(java.lang.Object):152:152 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.QH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    2:151:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:149 -> a
-    2:151:java.lang.Object invoke(java.lang.Object):145 -> a
-    152:152:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.vH:
+    1:1:java.lang.Object invoke(java.lang.Object):152:152 -> 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):152 -> a
+    159:159:java.lang.Object invoke(java.lang.Object):152:152 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.RH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    2:157:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:155 -> a
-    2:157:java.lang.Object invoke(java.lang.Object):145 -> a
-    158:158:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.wH:
+    1:1:java.lang.Object invoke(java.lang.Object):152:152 -> 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):152 -> a
+    165:165:java.lang.Object invoke(java.lang.Object):152:152 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.SH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1.invoke(int):161:161 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):145 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.EH:
+    1:1:java.lang.Object invoke(java.lang.Object):152:152 -> 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):152 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):152:152 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.aI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -59322,197 +59646,208 @@
     int $flags -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     java.lang.String $name -> d
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,java.lang.String,int,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):182:183 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):186:186 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):29:29 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,java.lang.String,int,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):189:190 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):193:193 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):36:36 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):186 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):189:189 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):193 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):196:196 -> a
+    4:4: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 -> a
     4:4: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 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):189 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):192:192 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):220:220 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):196 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):199:199 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):227:227 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):192 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):201:201 -> a
-    8:15:void visitEnd():206:213 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):195:195 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):199 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):208:208 -> a
+    8:15:void visitEnd():213:220 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):202:202 -> b
+    2:2: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
     2:2: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
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):195 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():198:198 -> b
-    4:4: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):271:271 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):202 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():205:205 -> b
+    4:4: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 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():198 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder getT():183:183 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.yH:
+    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.UH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
-    2:204:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:202 -> a
-    2:204:java.lang.Object invoke(java.lang.Object):182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.zH:
+    1:1:java.lang.Object invoke(java.lang.Object):189:189 -> 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):189 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.VH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
-    2:191:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:189 -> a
-    2:191:java.lang.Object invoke(java.lang.Object):182 -> a
-    192:192:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.AH:
+    1:1:java.lang.Object invoke(java.lang.Object):189:189 -> 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):189 -> a
+    199:199:java.lang.Object invoke(java.lang.Object):189:189 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.WH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
-    2:197:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:195 -> a
-    2:197:java.lang.Object invoke(java.lang.Object):182 -> a
-    198:198:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.BH:
+    1:1:java.lang.Object invoke(java.lang.Object):189:189 -> 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):189 -> a
+    205:205:java.lang.Object invoke(java.lang.Object):189:189 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.XH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
-    2:194:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:192 -> a
-    2:194:java.lang.Object invoke(java.lang.Object):182 -> a
-    195:195:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.CH:
+    1:1:java.lang.Object invoke(java.lang.Object):189:189 -> a
+    2:201:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:199 -> a
+    2:201:java.lang.Object invoke(java.lang.Object):189 -> a
+    202:202:java.lang.Object invoke(java.lang.Object):189:189 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.YH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
-    2:188:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:186 -> a
-    2:188:java.lang.Object invoke(java.lang.Object):182 -> a
-    189:189:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.DH:
+    1:1:java.lang.Object invoke(java.lang.Object):189:189 -> 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):189 -> a
+    196:196:java.lang.Object invoke(java.lang.Object):189:189 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.ZH:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1.invoke(int):198:198 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):182 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.KH:
+    1:1:java.lang.Object invoke(java.lang.Object):189:189 -> 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):189 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):189:189 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.gI:
 # {"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
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:58 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder access$getT$p(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1):57:57 -> a
-    2:2:void visitClass(java.lang.String):61:61 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):75:75 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):64:65 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder access$getT$p(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1):64:64 -> a
+    2:2:void visitClass(java.lang.String):68:68 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):82:82 -> a
+    4:4: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 -> a
     4:4: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 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):75 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):91:91 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):82 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):98:98 -> a
+    6:6: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 -> a
     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 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):91 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):97:97 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):98 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):104:104 -> a
+    8:8: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 -> a
     8:8: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 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):97 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):105:105 -> a
-    10:17:void visitEnd():110:117 -> a
-    1:1:void visitTypeAlias(java.lang.String):65:65 -> b
-    2:4:void visitStarProjection():69:69 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):94:94 -> b
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):104 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):112:112 -> a
+    10:17:void visitEnd():117:124 -> a
+    1:1:void visitTypeAlias(java.lang.String):72:72 -> b
+    2:4:void visitStarProjection():76:76 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):101:101 -> b
+    6:6: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
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):94 -> b
-    1:1:void visitTypeParameter(int):87:87 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.FH:
+    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.bI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
-    2:93:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:91 -> a
-    2:93:java.lang.Object invoke(java.lang.Object):57 -> a
-    94:94:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.GH:
+    1:1:java.lang.Object invoke(java.lang.Object):64:64 -> 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):64 -> a
+    101:101:java.lang.Object invoke(java.lang.Object):64:64 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.cI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
-    2:84: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):0:82 -> a
-    2:84:java.lang.Object invoke(java.lang.Object):57 -> a
-    85:85:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):76:76 -> a
-    85:85:java.lang.Object invoke(java.lang.Object):57 -> a
-    86:86:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.HH:
+    1:1:java.lang.Object invoke(java.lang.Object):64:64 -> a
+    2:91: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):0:89 -> a
+    2:91:java.lang.Object invoke(java.lang.Object):64 -> a
+    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):64 -> a
+    93:93:java.lang.Object invoke(java.lang.Object):64:64 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.dI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
-    2:108:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:106 -> a
-    2:108:java.lang.Object invoke(java.lang.Object):57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.IH:
+    1:1:java.lang.Object invoke(java.lang.Object):64:64 -> a
+    2:115:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:113 -> a
+    2:115:java.lang.Object invoke(java.lang.Object):64 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.eI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     java.lang.String $typeFlexibilityId -> b
-    1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
-    2:103:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:101 -> a
-    2:103:java.lang.Object invoke(java.lang.Object):57 -> a
-    104:104:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.JH:
+    1:1:java.lang.Object invoke(java.lang.Object):64:64 -> a
+    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):64 -> a
+    111:111:java.lang.Object invoke(java.lang.Object):64:64 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.fI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
-    2:96:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:94 -> a
-    2:96:java.lang.Object invoke(java.lang.Object):57 -> a
-    97:97:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.PH:
+    1:1:java.lang.Object invoke(java.lang.Object):64:64 -> 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):64 -> a
+    104:104:java.lang.Object invoke(java.lang.Object):64:64 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.mI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     java.lang.String $name -> e
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):241:242 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):245:245 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):29:29 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):253:254 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):257:257 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):36:36 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):245 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):251:251 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):257 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):263:263 -> a
+    4:4: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 -> a
     4:4: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 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):251 -> a
-    5:5:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):254:254 -> a
-    6:10:void visitEnd():261:265 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):248:248 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitExpandedType(int):263 -> a
+    5:5:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):266:266 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):273:273 -> a
+    7:11:void visitEnd():278:282 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):260:260 -> b
+    2:2: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
     2:2: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
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):248 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():258:258 -> b
-    4:4: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):271:271 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):260 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():270:270 -> b
+    4:4: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 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():258 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder getT():242:242 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.LH:
+    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.hI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
-    2:253:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:251 -> a
-    2:253:java.lang.Object invoke(java.lang.Object):241 -> a
-    254:254:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.MH:
+    1:1:java.lang.Object invoke(java.lang.Object):253:253 -> 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):253 -> a
+    266:266:java.lang.Object invoke(java.lang.Object):253:253 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.iI:
+# {"id":"sourceFile","fileName":"writers.kt"}
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
+    1:1:java.lang.Object invoke(java.lang.Object):253:253 -> 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):253 -> a
+    277:277:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.writeTypeAliasExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:0 -> a
+    277:277: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):274 -> a
+    277:277:java.lang.Object invoke(java.lang.Object):253 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.jI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
-    2:247:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:245 -> a
-    2:247:java.lang.Object invoke(java.lang.Object):241 -> a
-    248:248:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.NH:
+    1:1:java.lang.Object invoke(java.lang.Object):253:253 -> 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):253 -> a
+    260:260:java.lang.Object invoke(java.lang.Object):253:253 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.kI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
-    2:250:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:248 -> a
-    2:250:java.lang.Object invoke(java.lang.Object):241 -> a
-    251:251:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.OH:
+    1:1:java.lang.Object invoke(java.lang.Object):253:253 -> 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):253 -> a
+    263:263:java.lang.Object invoke(java.lang.Object):253:253 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.lI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1.invoke(int):258:258 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):241 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.SH:
+    1:1:java.lang.Object invoke(java.lang.Object):253:253 -> 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):253 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):253:253 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.pI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -59521,140 +59856,150 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     java.lang.String $name -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> g
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):29:30 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$getT$p(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1):29:29 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):33:33 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):36:37 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$getT$p(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1):36:36 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):40:40 -> a
+    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 -> a
     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 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):33 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):36:36 -> a
-    5:16:void visitEnd():41:52 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.QH:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):40 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43:43 -> a
+    5:16:void visitEnd():48:59 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.nI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
-    1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
-    2:39:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:37 -> a
-    2:39:java.lang.Object invoke(java.lang.Object):29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.RH:
+    1:1:java.lang.Object invoke(java.lang.Object):36:36 -> a
+    2:46:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:44 -> a
+    2:46:java.lang.Object invoke(java.lang.Object):36 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.oI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
-    2:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:33 -> a
-    2:35:java.lang.Object invoke(java.lang.Object):29 -> a
-    36:36:java.lang.Object invoke(java.lang.Object):29:29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.VH:
+    1:1:java.lang.Object invoke(java.lang.Object):36:36 -> 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):36 -> a
+    43:43:java.lang.Object invoke(java.lang.Object):36:36 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.tI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     java.lang.String $name -> e
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):220:221 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):224:224 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):227:228 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):231:231 -> a
+    2:2: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 -> a
     2:2: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 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):224 -> a
-    3:7:void visitEnd():230:234 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder getT():221:221 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):227:227 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):231 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):237:237 -> a
+    4:8:void visitEnd():242:246 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder getT():228:228 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):234:234 -> b
+    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):227 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.TH:
+    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.qI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
-    2:226:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:224 -> a
-    2:226:java.lang.Object invoke(java.lang.Object):220 -> a
-    227:227:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.UH:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
+    1:1:java.lang.Object invoke(java.lang.Object):227:227 -> 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):227 -> a
+    241:241:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.writeValueParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:0 -> a
+    241:241: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):238 -> a
+    241:241:java.lang.Object invoke(java.lang.Object):227 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.rI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
-    2:229:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:227 -> a
-    2:229:java.lang.Object invoke(java.lang.Object):220 -> a
-    230:230:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.YH:
+    1:1:java.lang.Object invoke(java.lang.Object):227:227 -> 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):227 -> a
+    234:234:java.lang.Object invoke(java.lang.Object):227:227 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.sI:
+# {"id":"sourceFile","fileName":"writers.kt"}
+    com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
+    1:1:java.lang.Object invoke(java.lang.Object):227:227 -> 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):227 -> a
+    237:237:java.lang.Object invoke(java.lang.Object):227:227 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.wI:
 # {"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
     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.kotlin.jvm.functions.Function1):271:271 -> <init>
-    1:5:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):275:279 -> a
-    6:6:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):278:278 -> a
-    7:7:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):277:277 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.getDefaultInstanceForType():21511:21511 -> a
-    8:8:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):281 -> a
-    9:15:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):281:287 -> a
-    16:16:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):286:286 -> a
-    17:17:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):285:285 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.getDefaultInstanceForType():21511:21511 -> a
-    18:18:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):289 -> a
-    19:26:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):289:296 -> a
-    27:27:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):275:275 -> a
-    28:33:void visitVersion(int,int,int):302:307 -> a
-    34:34:void visitVersion(int,int,int):305:305 -> a
-    35:35:void visitVersion(int,int,int):303:303 -> a
-    36:39:void visitEnd():312:315 -> a
-    40:40:void visitEnd():313:313 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder getT():272:272 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.WH:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):288:288 -> <init>
+    1:5:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):292:296 -> a
+    6:6:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):295:295 -> a
+    7:7:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):294:294 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.getDefaultInstanceForType():21535:21535 -> a
+    8:8:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):298 -> a
+    9:15:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):298:304 -> a
+    16:16:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):303:303 -> a
+    17:17:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):302:302 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.getDefaultInstanceForType():21535:21535 -> a
+    18:18:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):306 -> a
+    19:26:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):306:313 -> a
+    27:27:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):292:292 -> a
+    28:33:void visitVersion(int,int,int):319:324 -> a
+    34:34:void visitVersion(int,int,int):322:322 -> a
+    35:35:void visitVersion(int,int,int):320:320 -> a
+    36:39:void visitEnd():329:332 -> a
+    40:40: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.uI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1.invoke(int):306:306 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):271 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
-    4:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1.invoke(int):306:306 -> a
-    4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.XH:
+    1:1:java.lang.Object invoke(java.lang.Object):288:288 -> 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):288 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):288:288 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.vI:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2.invoke(int):307:307 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):271 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
-    4:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2.invoke(int):307:307 -> a
-    4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.ec:
+    1:1:java.lang.Object invoke(java.lang.Object):288:288 -> 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):288 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):288:288 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.fc:
 # {"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.fl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.Bl:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Hl:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.yl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.Ul:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Dl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Zl:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.Jl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.fm:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.Nl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.jm:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.Tl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.om:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.Wl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.rm:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.Oq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.um:
+# {"id":"sourceFile","fileName":"extensionNodes.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.Am:
+# {"id":"sourceFile","fileName":"extensionNodes.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.lr:
 # {"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.Nq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.kr:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
-    com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion $$INSTANCE -> c
-    1:2:void <clinit>():61:62 -> <clinit>
-    1:1:void <init>():61:61 -> <init>
+    com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion $$INSTANCE -> b
+    com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> a
+    1:2:void <clinit>():83:84 -> <clinit>
+    1:1:void <init>():83:83 -> <init>
     java.util.List getINSTANCES() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.Mq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.jr:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> a
-    1:2:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():63:64 -> a
-    1:2:java.lang.Object invoke():61 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.Hw:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.Rw:
+    1:2:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():85:86 -> a
+    1:2:java.lang.Object invoke():83 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.Zw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.jx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List argument_ -> d
@@ -59713,11 +60058,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.Iw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.ax:
     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.Pw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.hx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> g
@@ -59769,11 +60114,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.Jw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.bx:
     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.Kw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.cx:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -59816,7 +60161,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder.create():3963:3963 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder access$3600():3949 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:4003 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.Ow:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.gx:
     int memoizedSerializedSize -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> p
     int arrayDimensionCount_ -> l
@@ -59932,11 +60277,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.Lw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.dx:
     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.Mw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.ex:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -60007,7 +60352,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value build():3060:3060 -> g
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> h
     1:3:void ensureArrayElementIsMutable():3530:3532 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.Nw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.fx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> b
     int value -> a
@@ -60040,7 +60385,7 @@
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> d
     12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> d
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.Qw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.ix:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -60078,7 +60423,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation build():4371:4371 -> g
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> h
     1:3:void ensureArgumentIsMutable():4481:4483 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.nx:
     java.util.List sealedSubclassFqName_ -> r
     int nestedClassNameMemoizedSerializedSize -> l
     java.util.List typeAlias_ -> p
@@ -60104,172 +60449,172 @@
     java.util.List typeParameter_ -> g
     java.util.List constructor_ -> m
     java.util.List nestedClassName_ -> k
-    1:2708:void <clinit>():8777:11484 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):8497:8497 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):8497:8497 -> <init>
-    3:1002:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8504:9503 -> <init>
-    1003:1003:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8505:8505 -> <init>
-    1004:2001:void <init>(boolean):8507:8507 -> <init>
-    2002:2983:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8522:9503 -> <init>
-    2984:3184:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8523:8723 -> <init>
-    3185:3194:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8701:8710 -> <init>
-    3195:3198:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8694:8697 -> <init>
-    3199:3207:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8681:8689 -> <init>
-    3208:3217:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8667:8676 -> <init>
-    3218:3221:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8660:8663 -> <init>
-    3222:3225:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8652:8655 -> <init>
-    3226:3229:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8644:8647 -> <init>
-    3230:3233:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8636:8639 -> <init>
-    3234:3237:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8628:8631 -> <init>
-    3238:3241:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8620:8623 -> <init>
-    3242:3251:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8606:8615 -> <init>
-    3252:3255:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8599:8602 -> <init>
-    3256:3259:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8591:8594 -> <init>
-    3260:3263:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8583:8586 -> <init>
-    3264:3265:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8577:8578 -> <init>
-    3266:3267:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8572:8573 -> <init>
-    3268:3277:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8559:8568 -> <init>
-    3278:3281:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8552:8555 -> <init>
-    3282:3467:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8546:8731 -> <init>
-    3468:3513:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8729:8774 -> <init>
-    3514:3553:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8735:8774 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9346:9346 -> A
-    1:1:boolean hasCompanionObjectName():8962:8962 -> B
-    1:1:boolean hasFlags():8920:8920 -> C
-    1:1:boolean hasFqName():8947:8947 -> D
-    1:1:boolean hasTypeTable():9291:9291 -> E
-    1:1:boolean hasVersionRequirementTable():9340:9340 -> F
-    1:16:void initFields():9350:9365 -> G
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():9674:9674 -> H
-    1:1:java.util.List access$10000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> a
-    2:2:java.util.List access$10002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$10202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):8497:8497 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$10402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):8497:8497 -> a
-    5:5:int access$10502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8497:8497 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getDefaultInstanceForType():8515:8515 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():8497 -> a
-    7:12:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9435:9440 -> a
-    13:13:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertypeIdList():9048:9048 -> a
-    13:13:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9442 -> a
-    14:31:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9442:9459 -> a
-    32:32:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getNestedClassNameList():9071:9071 -> a
-    32:32:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9461 -> a
-    33:53:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9461:9481 -> a
-    54:54:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSealedSubclassFqNameList():9269:9269 -> a
-    54:54:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9483 -> a
-    55:72:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9483:9500 -> a
-    1:1:java.util.List access$10100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> b
-    2:2:java.util.List access$10102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> b
-    3:3:int access$8902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8497:8497 -> b
-    4:4:boolean isInitialized():9369:9369 -> b
-    5:5:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.hasFqName():8947:8947 -> b
-    5:5:boolean isInitialized():9373 -> b
-    6:6:boolean isInitialized():9374:9374 -> b
-    7:7:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeParameterCount():8990:8990 -> b
-    7:7:boolean isInitialized():9377 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeParameter(int):8996:8996 -> b
-    8:8:boolean isInitialized():9378 -> b
-    9:10:boolean isInitialized():9378:9379 -> b
-    11:11:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertypeCount():9025:9025 -> b
-    11:11:boolean isInitialized():9383 -> b
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertype(int):9031:9031 -> b
-    12:12:boolean isInitialized():9384 -> b
-    13:14:boolean isInitialized():9384:9385 -> b
-    15:15:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getConstructorCount():9106:9106 -> b
-    15:15:boolean isInitialized():9389 -> b
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getConstructor(int):9112:9112 -> b
-    16:16:boolean isInitialized():9390 -> b
-    17:18:boolean isInitialized():9390:9391 -> b
-    19:19:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getFunctionCount():9141:9141 -> b
-    19:19:boolean isInitialized():9395 -> b
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getFunction(int):9147:9147 -> b
-    20:20:boolean isInitialized():9396 -> b
-    21:22:boolean isInitialized():9396:9397 -> b
-    23:23:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getPropertyCount():9176:9176 -> b
-    23:23:boolean isInitialized():9401 -> b
-    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getProperty(int):9182:9182 -> b
-    24:24:boolean isInitialized():9402 -> b
-    25:26:boolean isInitialized():9402:9403 -> b
-    27:27:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeAliasCount():9211:9211 -> b
-    27:27:boolean isInitialized():9407 -> b
-    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeAlias(int):9217:9217 -> b
-    28:28:boolean isInitialized():9408 -> b
-    29:30:boolean isInitialized():9408:9409 -> b
-    31:31:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getEnumEntryCount():9246:9246 -> b
-    31:31:boolean isInitialized():9413 -> b
-    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getEnumEntry(int):9252:9252 -> b
-    32:32:boolean isInitialized():9414 -> b
-    33:34:boolean isInitialized():9414:9415 -> b
-    35:35:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.hasTypeTable():9291:9291 -> b
-    35:35:boolean isInitialized():9419 -> b
-    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeTable():9297:9297 -> b
-    36:36:boolean isInitialized():9420 -> b
-    37:46:boolean isInitialized():9420:9429 -> b
-    1:1:java.util.List access$10300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> c
-    2:2:java.util.List access$10302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> c
-    3:3:int access$9002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8497:8497 -> c
-    4:15:int getSerializedSize():9505:9516 -> c
-    16:16:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertypeIdList():9048:9048 -> c
-    16:16:int getSerializedSize():9520 -> c
-    17:43:int getSerializedSize():9520:9546 -> c
-    44:44:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getNestedClassNameList():9071:9071 -> c
-    44:44:int getSerializedSize():9550 -> c
-    45:75:int getSerializedSize():9550:9580 -> c
-    76:76:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSealedSubclassFqNameList():9269:9269 -> c
-    76:76:int getSerializedSize():9584 -> c
-    77:91:int getSerializedSize():9584:9598 -> c
-    92:92:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getVersionRequirementList():9311:9311 -> c
-    92:92:int getSerializedSize():9602 -> c
-    93:101:int getSerializedSize():9602:9610 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$10600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> d
-    2:2:int access$9102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8497:8497 -> d
-    3:3:java.util.List access$9202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> d
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder():9674:9674 -> d
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilderForType():9675 -> d
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():8497 -> d
-    1:1:java.util.List access$9200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> e
-    2:2:java.util.List access$9302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder():9674:9674 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9677 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.toBuilder():9679 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():8497 -> e
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9677:9677 -> e
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.toBuilder():9679 -> e
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():8497 -> e
-    1:1:java.util.List access$9300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> f
-    2:2:java.util.List access$9402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> f
-    1:1:java.util.List access$9400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> g
-    2:2:java.util.List access$9502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> g
-    1:1:java.util.List access$9500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> h
-    2:2:java.util.List access$9602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> h
-    1:1:java.util.List access$9600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> i
-    2:2:java.util.List access$9702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> i
-    1:1:java.util.List access$9700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> j
-    2:2:java.util.List access$9802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> j
-    1:1:java.util.List access$9800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> k
-    2:2:java.util.List access$9902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8497:8497 -> k
-    3:3:int getCompanionObjectName():8968:8968 -> k
-    1:1:java.util.List access$9900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8497:8497 -> l
-    2:2:java.util.List getConstructorList():9093:9093 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstance():8511:8511 -> m
-    1:1:java.util.List getEnumEntryList():9233:9233 -> n
-    1:1:int getFlags():8938:8938 -> o
-    1:1:int getFqName():8953:8953 -> p
-    1:1:java.util.List getFunctionList():9128:9128 -> q
-    1:1:java.util.List getNestedClassNameList():9071:9071 -> r
-    1:1:java.util.List getPropertyList():9163:9163 -> s
-    1:1:java.util.List getSealedSubclassFqNameList():9269:9269 -> t
-    1:1:java.util.List getSupertypeIdList():9048:9048 -> u
-    1:1:java.util.List getSupertypeList():9012:9012 -> v
-    1:1:java.util.List getTypeAliasList():9198:9198 -> w
-    1:1:java.util.List getTypeParameterList():8977:8977 -> x
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9297:9297 -> y
-    1:1:java.util.List getVersionRequirementList():9311:9311 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.Sw:
-    1:1:void <init>():8778:8778 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8783:8783 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8778 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.Tw:
+    1:2714:void <clinit>():8779:11492 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):8499:8499 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):8499:8499 -> <init>
+    3:1004:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8506:9507 -> <init>
+    1005:1005:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8507:8507 -> <init>
+    1006:2005:void <init>(boolean):8509:8509 -> <init>
+    2006:2989:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8524:9507 -> <init>
+    2990:3190:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8525:8725 -> <init>
+    3191:3200:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8703:8712 -> <init>
+    3201:3204:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8696:8699 -> <init>
+    3205:3213:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8683:8691 -> <init>
+    3214:3223:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8669:8678 -> <init>
+    3224:3227:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8662:8665 -> <init>
+    3228:3231:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8654:8657 -> <init>
+    3232:3235:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8646:8649 -> <init>
+    3236:3239:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8638:8641 -> <init>
+    3240:3243:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8630:8633 -> <init>
+    3244:3247:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8622:8625 -> <init>
+    3248:3257:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8608:8617 -> <init>
+    3258:3261:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8601:8604 -> <init>
+    3262:3265:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8593:8596 -> <init>
+    3266:3269:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8585:8588 -> <init>
+    3270:3271:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8579:8580 -> <init>
+    3272:3273:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8574:8575 -> <init>
+    3274:3283:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8561:8570 -> <init>
+    3284:3287:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8554:8557 -> <init>
+    3288:3473:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8548:8733 -> <init>
+    3474:3519:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8731:8776 -> <init>
+    3520:3559:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8737:8776 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9350:9350 -> A
+    1:1:boolean hasCompanionObjectName():8966:8966 -> B
+    1:1:boolean hasFlags():8923:8923 -> C
+    1:1:boolean hasFqName():8951:8951 -> D
+    1:1:boolean hasTypeTable():9295:9295 -> E
+    1:1:boolean hasVersionRequirementTable():9344:9344 -> F
+    1:16:void initFields():9354:9369 -> G
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():9678:9678 -> H
+    1:1:java.util.List access$10000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> a
+    2:2:java.util.List access$10002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$10202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):8499:8499 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$10402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):8499:8499 -> a
+    5:5:int access$10502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8499:8499 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getDefaultInstanceForType():8517:8517 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():8499 -> a
+    7:12:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9439:9444 -> a
+    13:13:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertypeIdList():9052:9052 -> a
+    13:13:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9446 -> a
+    14:31:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9446:9463 -> a
+    32:32:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getNestedClassNameList():9075:9075 -> a
+    32:32:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9465 -> a
+    33:53:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9465:9485 -> a
+    54:54:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSealedSubclassFqNameList():9273:9273 -> a
+    54:54:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9487 -> a
+    55:72:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):9487:9504 -> a
+    1:1:java.util.List access$10100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> b
+    2:2:java.util.List access$10102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> b
+    3:3:int access$8902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8499:8499 -> b
+    4:4:boolean isInitialized():9373:9373 -> b
+    5:5:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.hasFqName():8951:8951 -> b
+    5:5:boolean isInitialized():9377 -> b
+    6:6:boolean isInitialized():9378:9378 -> b
+    7:7:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeParameterCount():8994:8994 -> b
+    7:7:boolean isInitialized():9381 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeParameter(int):9000:9000 -> b
+    8:8:boolean isInitialized():9382 -> b
+    9:10:boolean isInitialized():9382:9383 -> b
+    11:11:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertypeCount():9029:9029 -> b
+    11:11:boolean isInitialized():9387 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertype(int):9035:9035 -> b
+    12:12:boolean isInitialized():9388 -> b
+    13:14:boolean isInitialized():9388:9389 -> b
+    15:15:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getConstructorCount():9110:9110 -> b
+    15:15:boolean isInitialized():9393 -> b
+    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getConstructor(int):9116:9116 -> b
+    16:16:boolean isInitialized():9394 -> b
+    17:18:boolean isInitialized():9394:9395 -> b
+    19:19:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getFunctionCount():9145:9145 -> b
+    19:19:boolean isInitialized():9399 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getFunction(int):9151:9151 -> b
+    20:20:boolean isInitialized():9400 -> b
+    21:22:boolean isInitialized():9400:9401 -> b
+    23:23:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getPropertyCount():9180:9180 -> b
+    23:23:boolean isInitialized():9405 -> b
+    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getProperty(int):9186:9186 -> b
+    24:24:boolean isInitialized():9406 -> b
+    25:26:boolean isInitialized():9406:9407 -> b
+    27:27:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeAliasCount():9215:9215 -> b
+    27:27:boolean isInitialized():9411 -> b
+    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeAlias(int):9221:9221 -> b
+    28:28:boolean isInitialized():9412 -> b
+    29:30:boolean isInitialized():9412:9413 -> b
+    31:31:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getEnumEntryCount():9250:9250 -> b
+    31:31:boolean isInitialized():9417 -> b
+    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getEnumEntry(int):9256:9256 -> b
+    32:32:boolean isInitialized():9418 -> b
+    33:34:boolean isInitialized():9418:9419 -> b
+    35:35:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.hasTypeTable():9295:9295 -> b
+    35:35:boolean isInitialized():9423 -> b
+    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getTypeTable():9301:9301 -> b
+    36:36:boolean isInitialized():9424 -> b
+    37:46:boolean isInitialized():9424:9433 -> b
+    1:1:java.util.List access$10300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> c
+    2:2:java.util.List access$10302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> c
+    3:3:int access$9002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8499:8499 -> c
+    4:15:int getSerializedSize():9509:9520 -> c
+    16:16:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSupertypeIdList():9052:9052 -> c
+    16:16:int getSerializedSize():9524 -> c
+    17:43:int getSerializedSize():9524:9550 -> c
+    44:44:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getNestedClassNameList():9075:9075 -> c
+    44:44:int getSerializedSize():9554 -> c
+    45:75:int getSerializedSize():9554:9584 -> c
+    76:76:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getSealedSubclassFqNameList():9273:9273 -> c
+    76:76:int getSerializedSize():9588 -> c
+    77:91:int getSerializedSize():9588:9602 -> c
+    92:92:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.getVersionRequirementList():9315:9315 -> c
+    92:92:int getSerializedSize():9606 -> c
+    93:101:int getSerializedSize():9606:9614 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$10600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> d
+    2:2:int access$9102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,int):8499:8499 -> d
+    3:3:java.util.List access$9202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> d
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder():9678:9678 -> d
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilderForType():9679 -> d
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():8499 -> d
+    1:1:java.util.List access$9200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> e
+    2:2:java.util.List access$9302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder():9678:9678 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9681 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.toBuilder():9683 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():8499 -> e
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9681:9681 -> e
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.toBuilder():9683 -> e
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():8499 -> e
+    1:1:java.util.List access$9300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> f
+    2:2:java.util.List access$9402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> f
+    1:1:java.util.List access$9400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> g
+    2:2:java.util.List access$9502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> g
+    1:1:java.util.List access$9500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> h
+    2:2:java.util.List access$9602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> h
+    1:1:java.util.List access$9600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> i
+    2:2:java.util.List access$9702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> i
+    1:1:java.util.List access$9700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> j
+    2:2:java.util.List access$9802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> j
+    1:1:java.util.List access$9800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> k
+    2:2:java.util.List access$9902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,java.util.List):8499:8499 -> k
+    3:3:int getCompanionObjectName():8972:8972 -> k
+    1:1:java.util.List access$9900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):8499:8499 -> l
+    2:2:java.util.List getConstructorList():9097:9097 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstance():8513:8513 -> m
+    1:1:java.util.List getEnumEntryList():9237:9237 -> n
+    1:1:int getFlags():8942:8942 -> o
+    1:1:int getFqName():8957:8957 -> p
+    1:1:java.util.List getFunctionList():9132:9132 -> q
+    1:1:java.util.List getNestedClassNameList():9075:9075 -> r
+    1:1:java.util.List getPropertyList():9167:9167 -> s
+    1:1:java.util.List getSealedSubclassFqNameList():9273:9273 -> t
+    1:1:java.util.List getSupertypeIdList():9052:9052 -> u
+    1:1:java.util.List getSupertypeList():9016:9016 -> v
+    1:1:java.util.List getTypeAliasList():9202:9202 -> w
+    1:1:java.util.List getTypeParameterList():8981:8981 -> x
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9301:9301 -> y
+    1:1:java.util.List getVersionRequirementList():9315:9315 -> z
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.kx:
+    1:1:void <init>():8780:8780 -> <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):8785:8785 -> 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):8780 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.lx:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -60287,107 +60632,107 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> t
     java.util.List constructor_ -> l
     java.util.List nestedClassName_ -> k
-    1:1730:void <init>():9690:11419 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):9684:9684 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9837:9839 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.setFlags(int):10101:10102 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9839 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9841:9842 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.setFqName(int):10145:10146 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9842 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9844:9845 -> a
-    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.setCompanionObjectName(int):10177:10178 -> a
-    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9845 -> a
-    15:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9847:9870 -> a
-    39:41:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureSupertypeIdIsMutable():10444:10446 -> a
-    39:41:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9872 -> a
-    42:117:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9873:9948 -> a
-    118:120:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11304:11306 -> a
-    118:120:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9948 -> a
-    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():12993:12993 -> a
-    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996 -> a
-    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11306 -> a
-    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9948 -> a
-    122:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> a
-    122:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11306 -> a
-    122:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9948 -> a
-    123:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11306:11312 -> a
-    123:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9948 -> a
-    130:141:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9950:9961 -> a
-    142:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11458:11460 -> a
-    142:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9961 -> a
-    145:145:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder():22167:22167 -> a
-    145:145:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170 -> a
-    145:145:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11460 -> a
-    145:145:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9961 -> a
-    146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> a
-    146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11460 -> a
-    146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9961 -> a
-    147:153:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11460:11466 -> a
-    147:153:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9961 -> a
-    154:155:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9963:9964 -> a
-    156:162:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):10035:10041 -> a
-    156:162:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):9684 -> a
-    163:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):10037:10041 -> a
-    163:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):9684 -> a
-    168:169:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):10272:10273 -> a
-    170:171:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addSupertype(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):10397:10398 -> a
-    172:173:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addNestedClassName(int):10548:10549 -> a
-    174:175:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10654:10655 -> a
-    176:177:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13764:13765 -> a
-    176:177:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10655 -> a
-    178:178:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10655:10655 -> a
+    1:1734:void <init>():9694:11427 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):9688:9688 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9841:9843 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.setFlags(int):10108:10109 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9843 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9845:9846 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.setFqName(int):10153:10154 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9846 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9848:9849 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.setCompanionObjectName(int):10185:10186 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9849 -> a
+    15:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9851:9874 -> a
+    39:41:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureSupertypeIdIsMutable():10452:10454 -> a
+    39:41:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9876 -> a
+    42:117:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9877:9952 -> a
+    118:120:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11312:11314 -> a
+    118:120:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9952 -> a
+    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():13001:13001 -> a
+    121:121: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):13004 -> a
+    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11314 -> a
+    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9952 -> a
+    122:122: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):13004:13004 -> a
+    122:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11314 -> a
+    122:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9952 -> a
+    123:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11314:11320 -> a
+    123:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9952 -> a
+    130:141:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9954:9965 -> a
+    142:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11466:11468 -> a
+    142:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9965 -> a
+    145:145:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder():22191:22191 -> a
+    145:145: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):22194 -> a
+    145:145:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11468 -> a
+    145:145:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9965 -> a
+    146:146: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):22194:22194 -> a
+    146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11468 -> a
+    146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9965 -> a
+    147:153:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11468:11474 -> a
+    147:153:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9965 -> a
+    154:155:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class):9967:9968 -> a
+    156:162:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):10039:10045 -> a
+    156:162:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):9688 -> a
+    163:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):10041:10045 -> a
+    163:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):9688 -> a
+    168:169:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):10280:10281 -> a
+    170:171:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addSupertype(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):10405:10406 -> a
+    172:173:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addNestedClassName(int):10556:10557 -> a
+    174:175:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10662:10663 -> a
+    176:177:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13776:13777 -> a
+    176:177:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10663 -> a
+    178:178:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10663:10663 -> a
     179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13766 -> a
-    179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10655 -> a
-    180:180:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13766:13766 -> a
-    180:180:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10655 -> a
-    181:182:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10779:10780 -> a
-    183:184:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):10904:10905 -> a
-    185:186:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11029:11030 -> a
-    187:188:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11154:11155 -> a
-    189:190:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20707:20708 -> a
-    189:190:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
-    191:191:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155:11155 -> a
+    179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13778 -> a
+    179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10663 -> a
+    180:180:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13778:13778 -> a
+    180:180:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10663 -> a
+    181:182:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10787:10788 -> a
+    183:184:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):10912:10913 -> a
+    185:186:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11037:11038 -> a
+    187:188:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11162:11163 -> a
+    189:190:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20731:20732 -> a
+    189:190:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11163 -> a
+    191:191:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11163:11163 -> a
     192:192:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    192:192:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709 -> a
-    192:192:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
-    193:193:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709:20709 -> a
-    193:193:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
-    194:196:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11439:11441 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addSealedSubclassFqName(int):11239:11240 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9746:9747 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():9684 -> c
+    192:192:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20733 -> a
+    192:192:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11163 -> a
+    193:193:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20733:20733 -> a
+    193:193:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11163 -> a
+    194:196:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11447:11449 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addSealedSubclassFqName(int):11247:11248 -> b
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9750:9751 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():9688 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():9684 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748:9748 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():9684 -> c
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addVersionRequirement(int):11385:11386 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.create():9697:9697 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.clone():9738 -> clone
-    1:1:java.lang.Object clone():9684 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.clone():9738:9738 -> clone
-    2:2:java.lang.Object clone():9684 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.getDefaultInstanceForType():9742:9742 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():9684 -> d
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setCompanionObjectName(int):10177:10178 -> d
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setFlags(int):10101:10102 -> e
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setFqName(int):10145:10146 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.create():9697:9697 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder access$8700():9684 -> g
-    1:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9754:9832 -> h
-    1:3:void ensureConstructorIsMutable():10577:10579 -> i
-    1:3:void ensureEnumEntryIsMutable():11077:11079 -> j
-    1:3:void ensureFunctionIsMutable():10702:10704 -> k
-    1:3:void ensureNestedClassNameIsMutable():10510:10512 -> l
-    1:3:void ensurePropertyIsMutable():10827:10829 -> m
-    1:3:void ensureSealedSubclassFqNameIsMutable():11201:11203 -> n
-    1:3:void ensureSupertypeIsMutable():10320:10322 -> o
-    1:3:void ensureTypeAliasIsMutable():10952:10954 -> p
-    1:3:void ensureTypeParameterIsMutable():10195:10197 -> q
-    1:3:void ensureVersionRequirementIsMutable():11327:11329 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.Uw:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9752 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():9688 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9752:9752 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():9688 -> c
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addVersionRequirement(int):11393:11394 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.create():9701:9701 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.clone():9742 -> clone
+    1:1:java.lang.Object clone():9688 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.clone():9742:9742 -> clone
+    2:2:java.lang.Object clone():9688 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.getDefaultInstanceForType():9746:9746 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():9688 -> d
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setCompanionObjectName(int):10185:10186 -> d
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setFlags(int):10108:10109 -> e
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setFqName(int):10153:10154 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.create():9701:9701 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder access$8700():9688 -> g
+    1:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9758:9836 -> h
+    1:3:void ensureConstructorIsMutable():10585:10587 -> i
+    1:3:void ensureEnumEntryIsMutable():11085:11087 -> j
+    1:3:void ensureFunctionIsMutable():10710:10712 -> k
+    1:3:void ensureNestedClassNameIsMutable():10518:10520 -> l
+    1:3:void ensurePropertyIsMutable():10835:10837 -> m
+    1:3:void ensureSealedSubclassFqNameIsMutable():11209:11211 -> n
+    1:3:void ensureSupertypeIsMutable():10328:10330 -> o
+    1:3:void ensureTypeAliasIsMutable():10960:10962 -> p
+    1:3:void ensureTypeParameterIsMutable():10203:10205 -> q
+    1:3:void ensureVersionRequirementIsMutable():11335:11337 -> r
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.mx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind ENUM_CLASS -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> c
@@ -60397,12 +60742,12 @@
     int value -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind OBJECT -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] $VALUES -> i
-    1:25:void <clinit>():8804:8828 -> <clinit>
-    26:26:void <clinit>():8795:8795 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int,int):8894:8895 -> <init>
-    1:1:int getNumber():8865:8865 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8795:8795 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.Yw:
+    1:25:void <clinit>():8806:8830 -> <clinit>
+    26:26:void <clinit>():8797:8797 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int,int):8896:8897 -> <init>
+    1:1:int getNumber():8867:8867 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8797:8797 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.qx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List versionRequirement_ -> f
     java.util.List valueParameter_ -> e
@@ -60412,188 +60757,188 @@
     int bitField0_ -> c
     byte memoizedIsInitialized -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> j
-    1:664:void <clinit>():13473:14136 -> <clinit>
-    665:667:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.initFields():13586:13588 -> <clinit>
-    665:667:void <clinit>():14137 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):13367:13367 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):13367:13367 -> <init>
-    3:258:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):13374:13629 -> <init>
-    259:259:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):13375:13375 -> <init>
-    260:513:void <init>(boolean):13377:13377 -> <init>
-    514:751:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13392:13629 -> <init>
-    752:805:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13393:13446 -> <init>
-    806:809:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13430:13433 -> <init>
-    810:813:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13422:13425 -> <init>
-    814:852:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13416:13454 -> <init>
-    853:871:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13452:13470 -> <init>
-    872:884:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13458:13470 -> <init>
-    1:1:int access$12702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13367:13367 -> a
-    2:2:java.util.List access$12800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13367:13367 -> a
-    3:3:java.util.List access$12802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13367:13367 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getDefaultInstanceForType():13385:13385 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():13367 -> a
-    5:19:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):13612:13626 -> a
-    1:1:java.util.List access$12900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13367:13367 -> b
-    2:2:java.util.List access$12902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13367:13367 -> b
-    3:3:int access$13002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13367:13367 -> b
-    4:4:boolean isInitialized():13592:13592 -> b
-    5:5:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameterCount():13535:13535 -> b
-    5:5:boolean isInitialized():13596 -> b
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameter(int):13541:13541 -> b
-    6:6:boolean isInitialized():13597 -> b
-    7:16:boolean isInitialized():13597:13606 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$13100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13367:13367 -> c
-    2:17:int getSerializedSize():13631:13646 -> c
-    18:18:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getVersionRequirementList():13562:13562 -> c
-    18:18:int getSerializedSize():13650 -> c
-    19:23:int getSerializedSize():13650:13654 -> c
-    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.newBuilder():13718:13718 -> d
-    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.newBuilderForType():13719 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():13367 -> d
-    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.newBuilder():13718:13718 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13721 -> e
-    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.toBuilder():13723 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():13367 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13721:13721 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.toBuilder():13723 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():13367 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13381:13381 -> k
-    1:1:int getFlags():13513:13513 -> l
-    1:1:java.util.List getValueParameterList():13522:13522 -> m
-    1:1:java.util.List getVersionRequirementList():13562:13562 -> n
-    1:1:boolean hasFlags():13501:13501 -> o
-    1:3:void initFields():13586:13588 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13718:13718 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.Ww:
-    1:1:void <init>():13474:13474 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13479:13479 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13474 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.Xw:
+    1:670:void <clinit>():13483:14152 -> <clinit>
+    671:673:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.initFields():13598:13600 -> <clinit>
+    671:673:void <clinit>():14153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):13377:13377 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):13377:13377 -> <init>
+    3:260:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):13384:13641 -> <init>
+    261:261:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):13385:13385 -> <init>
+    262:517:void <init>(boolean):13387:13387 -> <init>
+    518:757:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13402:13641 -> <init>
+    758:811:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13403:13456 -> <init>
+    812:815:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13440:13443 -> <init>
+    816:819:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13432:13435 -> <init>
+    820:858:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13426:13464 -> <init>
+    859:877:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13462:13480 -> <init>
+    878:890:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13468:13480 -> <init>
+    1:1:int access$12702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13377:13377 -> a
+    2:2:java.util.List access$12800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13377:13377 -> a
+    3:3:java.util.List access$12802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13377:13377 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getDefaultInstanceForType():13395:13395 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():13377 -> a
+    5:19:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):13624:13638 -> a
+    1:1:java.util.List access$12900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13377:13377 -> b
+    2:2:java.util.List access$12902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,java.util.List):13377:13377 -> b
+    3:3:int access$13002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):13377:13377 -> b
+    4:4:boolean isInitialized():13604:13604 -> b
+    5:5:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameterCount():13547:13547 -> b
+    5:5:boolean isInitialized():13608 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameter(int):13553:13553 -> b
+    6:6:boolean isInitialized():13609 -> b
+    7:16:boolean isInitialized():13609:13618 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$13100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13377:13377 -> c
+    2:17:int getSerializedSize():13643:13658 -> c
+    18:18:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.getVersionRequirementList():13574:13574 -> c
+    18:18:int getSerializedSize():13662 -> c
+    19:23:int getSerializedSize():13662:13666 -> c
+    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.newBuilder():13730:13730 -> d
+    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.newBuilderForType():13731 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():13377 -> d
+    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.newBuilder():13730:13730 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13733 -> e
+    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.toBuilder():13735 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():13377 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13733:13733 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor.toBuilder():13735 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():13377 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13391:13391 -> k
+    1:1:int getFlags():13525:13525 -> l
+    1:1:java.util.List getValueParameterList():13534:13534 -> m
+    1:1:java.util.List getVersionRequirementList():13574:13574 -> n
+    1:1:boolean hasFlags():13512:13512 -> o
+    1:3:void initFields():13598:13600 -> p
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13730:13730 -> q
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.ox:
+    1:1:void <init>():13484:13484 -> <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):13489:13489 -> 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):13484 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.px:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
     java.util.List versionRequirement_ -> g
-    1:305:void <init>():13734:14038 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):13728:13728 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13794:13796 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.setFlags(int):13892:13893 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13796 -> a
-    7:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13798:13819 -> a
-    29:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13844:13850 -> a
-    29:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13728 -> a
-    36:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13846:13850 -> a
-    36:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13728 -> a
-    41:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):13970:13971 -> a
-    43:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder addVersionRequirement(int):14098:14099 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder setFlags(int):13892:13893 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13764:13765 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13728 -> c
+    1:309:void <init>():13746:14054 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):13740:13740 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13806:13808 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.setFlags(int):13907:13908 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13808 -> a
+    7:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor):13810:13831 -> a
+    29:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13856:13862 -> a
+    29:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13740 -> a
+    36:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13858:13862 -> a
+    36:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13740 -> a
+    41:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):13986:13987 -> a
+    43:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder addVersionRequirement(int):14114:14115 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder setFlags(int):13907:13908 -> b
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13776:13777 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13740 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13766 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13728 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13766:13766 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13728 -> c
-    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():13741:13741 -> clone
-    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.clone():13756 -> clone
-    1:1:java.lang.Object clone():13728 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.clone():13756:13756 -> clone
-    2:2:java.lang.Object clone():13728 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.getDefaultInstanceForType():13760:13760 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():13728 -> d
-    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():13741:13741 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12500():13728 -> g
-    1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13772:13789 -> h
-    1:3:void ensureValueParameterIsMutable():13916:13918 -> i
-    1:3:void ensureVersionRequirementIsMutable():14040:14042 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.bx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13778 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13740 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13778:13778 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13740 -> c
+    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():13753:13753 -> clone
+    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.clone():13768 -> clone
+    1:1:java.lang.Object clone():13740 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.clone():13768:13768 -> clone
+    2:2:java.lang.Object clone():13740 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.getDefaultInstanceForType():13772:13772 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():13740 -> d
+    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():13753:13753 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12500():13740 -> g
+    1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13784:13801 -> h
+    1:3:void ensureValueParameterIsMutable():13932:13934 -> i
+    1:3:void ensureVersionRequirementIsMutable():14056:14058 -> j
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.tx:
     java.util.List effect_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> f
     int memoizedSerializedSize -> d
     byte memoizedIsInitialized -> c
-    1:390:void <clinit>():23388:23777 -> <clinit>
-    391:391:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.initFields():23439:23439 -> <clinit>
-    391:391:void <clinit>():23778 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23312:23312 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23312:23312 -> <init>
-    3:151:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23318:23466 -> <init>
-    152:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23319:23319 -> <init>
-    153:299:void <init>(boolean):23321:23321 -> <init>
-    300:430:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23336:23466 -> <init>
-    431:466:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23337:23372 -> <init>
-    467:482:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23370:23385 -> <init>
-    483:490:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23376:23383 -> <init>
-    1:1:java.util.List access$22500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23312:23312 -> a
-    2:2:java.util.List access$22502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,java.util.List):23312:23312 -> a
-    3:7:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):23459:23463 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$22600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23312:23312 -> b
-    2:2:boolean isInitialized():23443:23443 -> b
-    3:3:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.getEffectCount():23422:23422 -> b
-    3:3:boolean isInitialized():23447 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.getEffect(int):23428:23428 -> b
-    4:4:boolean isInitialized():23448 -> b
-    5:10:boolean isInitialized():23448:23453 -> b
-    1:10:int getSerializedSize():23468:23477 -> c
-    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.newBuilder():23541:23541 -> d
-    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.newBuilderForType():23542 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():23312 -> d
-    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.newBuilder():23541:23541 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544 -> e
-    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.toBuilder():23546 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23312 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544:23544 -> e
-    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.toBuilder():23546 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23312 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getDefaultInstance():23325:23325 -> g
-    1:1:java.util.List getEffectList():23409:23409 -> h
-    1:1:void initFields():23439:23439 -> i
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():23541:23541 -> j
-    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.newBuilder():23541:23541 -> k
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544 -> k
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544:23544 -> k
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.Zw:
-    1:1:void <init>():23389:23389 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23394:23394 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23389 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.ax:
+    1:390:void <clinit>():23412:23801 -> <clinit>
+    391:391:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.initFields():23463:23463 -> <clinit>
+    391:391:void <clinit>():23802 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23336:23336 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23336:23336 -> <init>
+    3:151:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23342:23490 -> <init>
+    152:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23343:23343 -> <init>
+    153:299:void <init>(boolean):23345:23345 -> <init>
+    300:430:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23360:23490 -> <init>
+    431:466:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23361:23396 -> <init>
+    467:482:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23394:23409 -> <init>
+    483:490:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23400:23407 -> <init>
+    1:1:java.util.List access$22500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23336:23336 -> a
+    2:2:java.util.List access$22502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract,java.util.List):23336:23336 -> a
+    3:7:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):23483:23487 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$22600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23336:23336 -> b
+    2:2:boolean isInitialized():23467:23467 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.getEffectCount():23446:23446 -> b
+    3:3:boolean isInitialized():23471 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.getEffect(int):23452:23452 -> b
+    4:4:boolean isInitialized():23472 -> b
+    5:10:boolean isInitialized():23472:23477 -> b
+    1:10:int getSerializedSize():23492:23501 -> c
+    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.newBuilder():23565:23565 -> d
+    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.newBuilderForType():23566 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():23336 -> d
+    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.newBuilder():23565:23565 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23568 -> e
+    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.toBuilder():23570 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23336 -> e
+    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):23568:23568 -> e
+    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.toBuilder():23570 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23336 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getDefaultInstance():23349:23349 -> g
+    1:1:java.util.List getEffectList():23433:23433 -> h
+    1:1:void initFields():23463:23463 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():23565:23565 -> j
+    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.newBuilder():23565:23565 -> k
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23568 -> k
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23570 -> 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):23568:23568 -> k
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23570 -> k
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.rx:
+    1:1:void <init>():23413:23413 -> <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):23418:23418 -> 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):23413 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.sx:
     java.util.List effect_ -> c
     int bitField0_ -> b
-    1:91:void <init>():23558:23648 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):23551:23551 -> a
-    2:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23603:23614 -> a
-    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23635:23641 -> a
-    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23551 -> a
-    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23637:23641 -> a
-    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23551 -> a
-    26:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23728:23729 -> a
-    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24407:24408 -> a
-    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23729 -> a
-    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23729:23729 -> a
+    1:91:void <init>():23582:23672 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):23575:23575 -> a
+    2:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23627:23638 -> a
+    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23659:23665 -> a
+    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23575 -> a
+    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23661:23665 -> a
+    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23575 -> a
+    26:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23752:23753 -> a
+    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24431:24432 -> a
+    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23753 -> a
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23753:23753 -> a
     31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24409 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23729 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24409:24409 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23729 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23584:23585 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():23551 -> c
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24433 -> a
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23753 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24433:24433 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder addEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):23753 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23608:23609 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():23575 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23586 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():23551 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23586:23586 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():23551 -> c
-    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():23565:23565 -> clone
-    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.clone():23576 -> clone
-    1:1:java.lang.Object clone():23551 -> clone
-    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$Builder.clone():23576:23576 -> clone
-    2:2:java.lang.Object clone():23551 -> clone
-    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():23565:23565 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
-    1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23592:23598 -> g
-    1:3:void ensureEffectIsMutable():23651:23653 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.gx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23610 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():23575 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23610:23610 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():23575 -> c
+    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():23589:23589 -> clone
+    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.clone():23600 -> clone
+    1:1:java.lang.Object clone():23575 -> clone
+    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$Builder.clone():23600:23600 -> clone
+    2:2:java.lang.Object clone():23575 -> clone
+    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():23589:23589 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23575 -> f
+    1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23616:23622 -> g
+    1:3:void ensureEffectIsMutable():23675:23677 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.yx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List effectConstructorArgument_ -> d
@@ -60604,135 +60949,135 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind kind_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> j
-    1:835:void <clinit>():23955:24789 -> <clinit>
-    836:839:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.initFields():24226:24229 -> <clinit>
-    836:839:void <clinit>():24790 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23842:23842 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23842:23842 -> <init>
-    3:426:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23848:24271 -> <init>
-    427:427:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23849:23849 -> <init>
-    428:849:void <init>(boolean):23851:23851 -> <init>
-    850:1255:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23866:24271 -> <init>
-    1256:1319:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23867:23930 -> <init>
-    1320:1328:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23911:23919 -> <init>
-    1329:1332:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23903:23906 -> <init>
-    1333:1382:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23890:23939 -> <init>
-    1383:1398:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23937:23952 -> <init>
-    1399:1406:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23943:23950 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType access$23002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType):23842:23842 -> a
-    2:2:java.util.List access$23100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):23842:23842 -> a
-    3:3:java.util.List access$23102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,java.util.List):23842:23842 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression access$23202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):23842:23842 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind access$23302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):23842:23842 -> a
-    6:6:int access$23402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,int):23842:23842 -> a
-    7:20:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):24255:24268 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$23500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):23842:23842 -> b
-    2:2:boolean isInitialized():24233:24233 -> b
-    3:3:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.getEffectConstructorArgumentCount():24169:24169 -> b
-    3:3:boolean isInitialized():24237 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.getEffectConstructorArgument(int):24175:24175 -> b
-    4:4:boolean isInitialized():24238 -> b
-    5:10:boolean isInitialized():24238:24243 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.getConclusionOfConditionalEffect():24207:24207 -> b
-    11:11:boolean isInitialized():24244 -> b
-    12:17:boolean isInitialized():24244:24249 -> b
-    1:22:int getSerializedSize():24273:24294 -> c
-    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.newBuilder():24358:24358 -> d
-    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.newBuilderForType():24359 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():23842 -> d
-    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.newBuilder():24358:24358 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24361 -> e
-    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.toBuilder():24363 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23842 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24361:24361 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.toBuilder():24363 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23842 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getConclusionOfConditionalEffect():24207:24207 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getDefaultInstance():23855:23855 -> h
-    1:1:java.util.List getEffectConstructorArgumentList():24156:24156 -> i
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType getEffectType():24147:24147 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind getKind():24222:24222 -> k
-    1:1:boolean hasConclusionOfConditionalEffect():24196:24196 -> l
-    1:1:boolean hasEffectType():24141:24141 -> m
-    1:1:boolean hasKind():24216:24216 -> n
-    1:4:void initFields():24226:24229 -> o
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24358:24358 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.cx:
-    1:1:void <init>():23956:23956 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23961:23961 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23956 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.dx:
+    1:835:void <clinit>():23979:24813 -> <clinit>
+    836:839:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.initFields():24250:24253 -> <clinit>
+    836:839:void <clinit>():24814 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23866:23866 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):23866:23866 -> <init>
+    3:426:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23872:24295 -> <init>
+    427:427:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):23873:23873 -> <init>
+    428:849:void <init>(boolean):23875:23875 -> <init>
+    850:1255:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23890:24295 -> <init>
+    1256:1319:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23891:23954 -> <init>
+    1320:1328:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23935:23943 -> <init>
+    1329:1332:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23927:23930 -> <init>
+    1333:1382:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23914:23963 -> <init>
+    1383:1398:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23961:23976 -> <init>
+    1399:1406:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23967:23974 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType access$23002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType):23866:23866 -> a
+    2:2:java.util.List access$23100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):23866:23866 -> a
+    3:3:java.util.List access$23102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,java.util.List):23866:23866 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression access$23202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):23866:23866 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind access$23302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):23866:23866 -> a
+    6:6:int access$23402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect,int):23866:23866 -> a
+    7:20:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):24279:24292 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$23500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):23866:23866 -> b
+    2:2:boolean isInitialized():24257:24257 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.getEffectConstructorArgumentCount():24193:24193 -> b
+    3:3:boolean isInitialized():24261 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.getEffectConstructorArgument(int):24199:24199 -> b
+    4:4:boolean isInitialized():24262 -> b
+    5:10:boolean isInitialized():24262:24267 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.getConclusionOfConditionalEffect():24231:24231 -> b
+    11:11:boolean isInitialized():24268 -> b
+    12:17:boolean isInitialized():24268:24273 -> b
+    1:22:int getSerializedSize():24297:24318 -> c
+    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.newBuilder():24382:24382 -> d
+    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.newBuilderForType():24383 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():23866 -> d
+    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.newBuilder():24382:24382 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24385 -> e
+    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.toBuilder():24387 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23866 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24385:24385 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect.toBuilder():24387 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23866 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getConclusionOfConditionalEffect():24231:24231 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getDefaultInstance():23879:23879 -> h
+    1:1:java.util.List getEffectConstructorArgumentList():24180:24180 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType getEffectType():24171:24171 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind getKind():24246:24246 -> k
+    1:1:boolean hasConclusionOfConditionalEffect():24220:24220 -> l
+    1:1:boolean hasEffectType():24165:24165 -> m
+    1:1:boolean hasKind():24240:24240 -> n
+    1:4:void initFields():24250:24253 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24382:24382 -> p
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.ux:
+    1:1:void <init>():23980:23980 -> <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):23985:23985 -> 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):23980 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.vx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     java.util.List effectConstructorArgument_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> e
     int bitField0_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind kind_ -> f
-    1:376:void <init>():24375:24750 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):24368:24368 -> a
-    2:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24440:24455 -> a
-    18:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24724:24726 -> a
-    18:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24455 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder():25553:25553 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24726 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24455 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556:25556 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24726 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24455 -> a
-    23:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24726:24732 -> a
-    23:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24455 -> a
-    30:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24457:24460 -> a
-    34:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24487:24493 -> a
-    34:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24368 -> a
-    41:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24489:24493 -> a
-    41:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24368 -> a
-    46:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setEffectType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType):24518:24521 -> a
-    50:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder addEffectConstructorArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):24615:24616 -> a
-    52:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24695:24697 -> a
-    55:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setKind(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):24768:24771 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24407:24408 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():24368 -> c
+    1:376:void <init>():24399:24774 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):24392:24392 -> a
+    2:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24464:24479 -> a
+    18:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24748:24750 -> a
+    18:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24479 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder():25577:25577 -> a
+    21:21: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):25580 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24750 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24479 -> a
+    22:22: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):25580:25580 -> a
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24750 -> a
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24479 -> a
+    23:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24750:24756 -> a
+    23:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24479 -> a
+    30:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect):24481:24484 -> a
+    34:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24511:24517 -> a
+    34:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24392 -> a
+    41:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24513:24517 -> a
+    41:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24392 -> a
+    46:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setEffectType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType):24542:24545 -> a
+    50:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder addEffectConstructorArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):24639:24640 -> a
+    52:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24719:24721 -> a
+    55:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder setKind(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):24792:24795 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24431:24432 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():24392 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24409 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():24368 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24409:24409 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():24368 -> c
-    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():24382:24382 -> clone
-    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.clone():24399 -> clone
-    1:1:java.lang.Object clone():24368 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.clone():24399:24399 -> clone
-    2:2:java.lang.Object clone():24368 -> clone
-    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():24382:24382 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
-    1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24415:24435 -> g
-    1:3:void ensureEffectConstructorArgumentIsMutable():24538:24540 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.ex:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24433 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():24392 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():24433:24433 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():24392 -> c
+    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():24406:24406 -> clone
+    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.clone():24423 -> clone
+    1:1:java.lang.Object clone():24392 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.clone():24423:24423 -> clone
+    2:2:java.lang.Object clone():24392 -> clone
+    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():24406:24406 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24392 -> f
+    1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24439:24459 -> g
+    1:3:void ensureEffectConstructorArgumentIsMutable():24562:24564 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.wx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] $VALUES -> e
     int value -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_CONSTANT -> b
-    1:18:void <clinit>():23990:24007 -> <clinit>
-    19:19:void <clinit>():23981:23981 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int,int):24062:24063 -> <init>
-    1:1:int getNumber():24037:24037 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24043:24043 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24042:24042 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24041:24041 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.fx:
+    1:18:void <clinit>():24014:24031 -> <clinit>
+    19:19:void <clinit>():24005:24005 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int,int):24086:24087 -> <init>
+    1:1:int getNumber():24061:24061 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24067:24067 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24066:24066 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24065:24065 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.xx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_LEAST_ONCE -> d
     int value -> a
-    1:9:void <clinit>():24077:24085 -> <clinit>
-    10:10:void <clinit>():24072:24072 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int,int):24127:24128 -> <init>
-    1:1:int getNumber():24102:24102 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24108:24108 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24107:24107 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24106:24106 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.jx:
+    1:9:void <clinit>():24101:24109 -> <clinit>
+    10:10:void <clinit>():24096:24096 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int,int):24151:24152 -> <init>
+    1:1:int getNumber():24126:24126 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24132:24132 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24131:24131 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24130:24130 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.Bx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> f
@@ -60740,77 +61085,77 @@
     int name_ -> d
     int bitField0_ -> c
     byte memoizedIsInitialized -> e
-    1:273:void <clinit>():20528:20800 -> <clinit>
-    274:274:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.initFields():20560:20560 -> <clinit>
-    274:274:void <clinit>():20801 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20457:20457 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20457:20457 -> <init>
-    3:128:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20464:20589 -> <init>
-    129:129:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20465:20465 -> <init>
-    130:253:void <init>(boolean):20467:20467 -> <init>
-    254:361:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20482:20589 -> <init>
-    362:394:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20483:20515 -> <init>
-    395:407:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20513:20525 -> <init>
-    408:414:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20519:20525 -> <init>
-    1:1:int access$19402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20457:20457 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$19600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20457:20457 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.getDefaultInstanceForType():20475:20475 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():20457 -> a
-    4:12:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):20578:20586 -> a
-    1:1:int access$19502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20457:20457 -> b
-    2:10:boolean isInitialized():20564:20572 -> b
-    1:11:int getSerializedSize():20591:20601 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder():20665:20665 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilderForType():20666 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20457 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder():20665:20665 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20668 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.toBuilder():20670 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20457 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20668:20668 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.toBuilder():20670 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20457 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20471:20471 -> k
-    1:1:int getName():20556:20556 -> l
-    1:1:boolean hasName():20550:20550 -> m
-    1:1:void initFields():20560:20560 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20665:20665 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.hx:
-    1:1:void <init>():20529:20529 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20534:20534 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20529 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.ix:
+    1:273:void <clinit>():20552:20824 -> <clinit>
+    274:274:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.initFields():20584:20584 -> <clinit>
+    274:274:void <clinit>():20825 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20481:20481 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20481:20481 -> <init>
+    3:128:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20488:20613 -> <init>
+    129:129:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20489:20489 -> <init>
+    130:253:void <init>(boolean):20491:20491 -> <init>
+    254:361:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20506:20613 -> <init>
+    362:394:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20507:20539 -> <init>
+    395:407:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20537:20549 -> <init>
+    408:414:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20543:20549 -> <init>
+    1:1:int access$19402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20481:20481 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$19600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20481:20481 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.getDefaultInstanceForType():20499:20499 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():20481 -> a
+    4:12:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):20602:20610 -> a
+    1:1:int access$19502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry,int):20481:20481 -> b
+    2:10:boolean isInitialized():20588:20596 -> b
+    1:11:int getSerializedSize():20615:20625 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder():20689:20689 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilderForType():20690 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20481 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder():20689:20689 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20692 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.toBuilder():20694 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20481 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20692:20692 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry.toBuilder():20694 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20481 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20495:20495 -> k
+    1:1:int getName():20580:20580 -> l
+    1:1:boolean hasName():20574:20574 -> m
+    1:1:void initFields():20584:20584 -> n
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20689:20689 -> o
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.zx:
+    1:1:void <init>():20553:20553 -> <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):20558:20558 -> 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):20553 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.Ax:
     int bitField0_ -> d
     int name_ -> e
-    1:1:void <init>():20681:20681 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):20675:20675 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20727:20729 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.setName(int):20781:20782 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20729 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20731:20732 -> a
-    9:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20751:20757 -> a
-    9:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20675 -> a
-    16:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20753:20757 -> a
-    16:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20675 -> a
-    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder setName(int):20781:20782 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20707:20708 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():20675 -> c
+    1:1:void <init>():20705:20705 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):20699:20699 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20751:20753 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.setName(int):20805:20806 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20753 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry):20755:20756 -> a
+    9:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20775:20781 -> a
+    9:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20699 -> a
+    16:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20777:20781 -> a
+    16:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20699 -> a
+    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder setName(int):20805:20806 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20731:20732 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():20699 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():20675 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709:20709 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():20675 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():20688:20688 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.clone():20699 -> clone
-    1:1:java.lang.Object clone():20675 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.clone():20699:20699 -> clone
-    2:2:java.lang.Object clone():20675 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.getDefaultInstanceForType():20703:20703 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():20675 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():20688:20688 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20675 -> g
-    1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.nx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20733 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():20699 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20733:20733 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():20699 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():20712:20712 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.clone():20723 -> clone
+    1:1:java.lang.Object clone():20699 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.clone():20723:20723 -> clone
+    2:2:java.lang.Object clone():20699 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.getDefaultInstanceForType():20727:20727 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():20699 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():20712:20712 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20699 -> g
+    1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20739:20746 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.Fx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int memoizedSerializedSize -> k
     int isInstanceTypeId_ -> g
@@ -60824,84 +61169,84 @@
     java.util.List andArgument_ -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression defaultInstance -> l
-    1:1328:void <clinit>():25074:26401 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):24947:24947 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):24947:24947 -> <init>
-    3:504:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):24953:25454 -> <init>
-    505:505:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):24954:24954 -> <init>
-    506:1005:void <init>(boolean):24956:24956 -> <init>
-    1006:1489:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24971:25454 -> <init>
-    1490:1565:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24972:25047 -> <init>
-    1566:1569:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25036:25039 -> <init>
-    1570:1571:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25030:25031 -> <init>
-    1572:1580:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25018:25026 -> <init>
-    1581:1588:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25005:25012 -> <init>
-    1589:1590:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25000:25001 -> <init>
-    1591:1651:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24995:25055 -> <init>
-    1652:1670:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25053:25071 -> <init>
-    1671:1681:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25059:25069 -> <init>
-    1:1:int access$23902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24947:24947 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue access$24102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):24947:24947 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$24202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):24947:24947 -> a
-    4:4:java.util.List access$24400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24947:24947 -> a
-    5:5:java.util.List access$24402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24947:24947 -> a
-    6:28:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):25429:25451 -> a
-    1:1:int access$24002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24947:24947 -> b
-    2:2:java.util.List access$24500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24947:24947 -> b
-    3:3:java.util.List access$24502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24947:24947 -> b
-    4:8:boolean isInitialized():25401:25405 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getIsInstanceType():25242:25242 -> b
-    9:9:boolean isInitialized():25406 -> b
-    10:11:boolean isInitialized():25406:25407 -> b
-    12:12:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getAndArgumentCount():25297:25297 -> b
-    12:12:boolean isInitialized():25411 -> b
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getAndArgument(int):25309:25309 -> b
-    13:13:boolean isInitialized():25412 -> b
-    14:15:boolean isInitialized():25412:25413 -> b
-    16:16:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getOrArgumentCount():25362:25362 -> b
-    16:16:boolean isInitialized():25417 -> b
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getOrArgument(int):25374:25374 -> b
-    17:17:boolean isInitialized():25418 -> b
-    18:23:boolean isInitialized():25418:25423 -> b
-    1:1:int access$24302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24947:24947 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$24700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24947:24947 -> c
-    3:36:int getSerializedSize():25456:25489 -> c
-    1:1:int access$24602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24947:24947 -> d
-    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():25553:25553 -> d
-    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.newBuilderForType():25554 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():24947 -> d
-    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.newBuilder():25553:25553 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556 -> e
-    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.toBuilder():25558 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():24947 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556:25556 -> e
-    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.toBuilder():25558 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():24947 -> e
-    1:1:java.util.List getAndArgumentList():25272:25272 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue getConstantValue():25217:25217 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24960:24960 -> i
-    1:1:int getFlags():25177:25177 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25242:25242 -> k
-    1:1:int getIsInstanceTypeId():25257:25257 -> l
-    1:1:java.util.List getOrArgumentList():25337:25337 -> m
-    1:1:int getValueParameterReference():25202:25202 -> n
-    1:1:boolean hasConstantValue():25211:25211 -> o
-    1:1:boolean hasFlags():25166:25166 -> p
-    1:1:boolean hasIsInstanceType():25231:25231 -> q
-    1:1:boolean hasIsInstanceTypeId():25251:25251 -> r
-    1:1:boolean hasValueParameterReference():25191:25191 -> s
-    1:7:void initFields():25391:25397 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25553:25553 -> u
-    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.newBuilder():25553:25553 -> v
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556 -> v
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556:25556 -> v
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.kx:
-    1:1:void <init>():25075:25075 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25080:25080 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25075 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.lx:
+    1:1328:void <clinit>():25098:26425 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):24971:24971 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):24971:24971 -> <init>
+    3:504:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):24977:25478 -> <init>
+    505:505:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):24978:24978 -> <init>
+    506:1005:void <init>(boolean):24980:24980 -> <init>
+    1006:1489:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24995:25478 -> <init>
+    1490:1565:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24996:25071 -> <init>
+    1566:1569:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25060:25063 -> <init>
+    1570:1571:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25054:25055 -> <init>
+    1572:1580:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25042:25050 -> <init>
+    1581:1588:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25029:25036 -> <init>
+    1589:1590:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25024:25025 -> <init>
+    1591:1651:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25019:25079 -> <init>
+    1652:1670:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25077:25095 -> <init>
+    1671:1681:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25083:25093 -> <init>
+    1:1:int access$23902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24971:24971 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue access$24102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):24971:24971 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$24202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):24971:24971 -> a
+    4:4:java.util.List access$24400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24971:24971 -> a
+    5:5:java.util.List access$24402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24971:24971 -> a
+    6:28:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):25453:25475 -> a
+    1:1:int access$24002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24971:24971 -> b
+    2:2:java.util.List access$24500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24971:24971 -> b
+    3:3:java.util.List access$24502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,java.util.List):24971:24971 -> b
+    4:8:boolean isInitialized():25425:25429 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getIsInstanceType():25266:25266 -> b
+    9:9:boolean isInitialized():25430 -> b
+    10:11:boolean isInitialized():25430:25431 -> b
+    12:12:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getAndArgumentCount():25321:25321 -> b
+    12:12:boolean isInitialized():25435 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getAndArgument(int):25333:25333 -> b
+    13:13:boolean isInitialized():25436 -> b
+    14:15:boolean isInitialized():25436:25437 -> b
+    16:16:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getOrArgumentCount():25386:25386 -> b
+    16:16:boolean isInitialized():25441 -> b
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.getOrArgument(int):25398:25398 -> b
+    17:17:boolean isInitialized():25442 -> b
+    18:23:boolean isInitialized():25442:25447 -> b
+    1:1:int access$24302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24971:24971 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$24700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):24971:24971 -> c
+    3:36:int getSerializedSize():25480:25513 -> c
+    1:1:int access$24602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression,int):24971:24971 -> d
+    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():25577:25577 -> d
+    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.newBuilderForType():25578 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():24971 -> d
+    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.newBuilder():25577:25577 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25580 -> e
+    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.toBuilder():25582 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():24971 -> e
+    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):25580:25580 -> e
+    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.toBuilder():25582 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():24971 -> e
+    1:1:java.util.List getAndArgumentList():25296:25296 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue getConstantValue():25241:25241 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24984:24984 -> i
+    1:1:int getFlags():25201:25201 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getIsInstanceType():25266:25266 -> k
+    1:1:int getIsInstanceTypeId():25281:25281 -> l
+    1:1:java.util.List getOrArgumentList():25361:25361 -> m
+    1:1:int getValueParameterReference():25226:25226 -> n
+    1:1:boolean hasConstantValue():25235:25235 -> o
+    1:1:boolean hasFlags():25190:25190 -> p
+    1:1:boolean hasIsInstanceType():25255:25255 -> q
+    1:1:boolean hasIsInstanceTypeId():25275:25275 -> r
+    1:1:boolean hasValueParameterReference():25215:25215 -> s
+    1:7:void initFields():25415:25421 -> t
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25577:25577 -> u
+    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.newBuilder():25577:25577 -> v
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25580 -> v
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25582 -> 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):25580:25580 -> v
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25582 -> v
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.Cx:
+    1:1:void <init>():25099:25099 -> <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):25104:25104 -> 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):25099 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.Dx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> f
     int isInstanceTypeId_ -> g
@@ -60910,69 +61255,69 @@
     java.util.List andArgument_ -> h
     int bitField0_ -> b
     int flags_ -> c
-    1:625:void <init>():25575:26199 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):25568:25568 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25659:25661 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.setFlags(int):25773:25774 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25661 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25663:25664 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.setValueParameterReference(int):25825:25826 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25664 -> a
-    11:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25666:25670 -> a
-    16:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25944:25946 -> a
-    16:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25670 -> a
+    1:625:void <init>():25599:26223 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):25592:25592 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25683:25685 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.setFlags(int):25797:25798 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25685 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25687:25688 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.setValueParameterReference(int):25849:25850 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25688 -> a
+    11:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25690:25694 -> a
+    16:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25968:25970 -> a
+    16:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25694 -> a
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25946 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25670 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25970 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25694 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25946 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25670 -> a
-    21:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25946:25952 -> a
-    21:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25670 -> a
-    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25672:25673 -> a
-    30:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.setIsInstanceTypeId(int):25987:25988 -> a
-    30:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25673 -> a
-    32:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25675:25695 -> a
-    53:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25728:25734 -> a
-    53:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25568 -> a
-    60:64:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25730:25734 -> a
-    60:64:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25568 -> a
-    65:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setFlags(int):25773:25774 -> a
-    67:70:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setConstantValue(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):25863:25866 -> a
-    71:73:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25915:25917 -> a
-    74:75:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addAndArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26130:26131 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setValueParameterReference(int):25825:25826 -> b
-    3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26327:26328 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():25568:25568 -> c
-    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():25582:25582 -> clone
-    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.clone():25605 -> clone
-    1:1:java.lang.Object clone():25568 -> clone
-    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$Builder.clone():25605:25605 -> clone
-    2:2:java.lang.Object clone():25568 -> clone
-    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():25582:25582 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$23700():25568 -> f
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression build():25613:25614 -> g
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25970 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25694 -> a
+    21:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25970:25976 -> a
+    21:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25694 -> a
+    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25696:25697 -> a
+    30:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.setIsInstanceTypeId(int):26011:26012 -> a
+    30:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25697 -> a
+    32:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25699:25719 -> a
+    53:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25752:25758 -> a
+    53:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25592 -> a
+    60:64:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25754:25758 -> a
+    60:64:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25592 -> a
+    65:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setFlags(int):25797:25798 -> a
+    67:70:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setConstantValue(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):25887:25890 -> a
+    71:73:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setIsInstanceType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):25939:25941 -> a
+    74:75:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addAndArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26154:26155 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder setValueParameterReference(int):25849:25850 -> b
+    3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder addOrArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):26351:26352 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():25592:25592 -> c
+    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():25606:25606 -> clone
+    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.clone():25629 -> clone
+    1:1:java.lang.Object clone():25592 -> clone
+    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$Builder.clone():25629:25629 -> clone
+    2:2:java.lang.Object clone():25592 -> clone
+    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():25606:25606 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$23700():25592 -> f
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression build():25637:25638 -> g
     3:3: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
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression build():25615 -> g
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression build():25615:25615 -> g
-    1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25621:25654 -> h
-    1:3:void ensureAndArgumentIsMutable():26005:26007 -> i
-    1:3:void ensureOrArgumentIsMutable():26202:26204 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.mx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression build():25639 -> g
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression build():25639:25639 -> g
+    1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25645:25678 -> h
+    1:3:void ensureAndArgumentIsMutable():26029:26031 -> i
+    1:3:void ensureOrArgumentIsMutable():26226:26228 -> j
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.Ex:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue TRUE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue FALSE -> c
     int value -> a
-    1:9:void <clinit>():25097:25105 -> <clinit>
-    10:10:void <clinit>():25092:25092 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int,int):25147:25148 -> <init>
-    1:1:int getNumber():25122:25122 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25128:25128 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25127:25127 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25126:25126 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.qx:
+    1:9:void <clinit>():25121:25129 -> <clinit>
+    10:10:void <clinit>():25116:25116 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int,int):25171:25172 -> <init>
+    1:1:int getNumber():25146:25146 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25152:25152 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25151:25151 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25150:25150 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.Ix:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> r
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int receiverTypeId_ -> k
@@ -60991,119 +61336,119 @@
     java.util.List versionRequirement_ -> n
     java.util.List valueParameter_ -> l
     int memoizedSerializedSize -> q
-    1:1590:void <clinit>():14502:16091 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14313:14313 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14313:14313 -> <init>
-    3:582:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14320:14899 -> <init>
-    583:583:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14321:14321 -> <init>
-    584:1161:void <init>(boolean):14323:14323 -> <init>
-    1162:1723:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14338:14899 -> <init>
-    1724:1857:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14339:14472 -> <init>
-    1858:1867:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14450:14459 -> <init>
-    1868:1871:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14443:14446 -> <init>
-    1872:1880:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14430:14438 -> <init>
-    1881:1882:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14424:14425 -> <init>
-    1883:1884:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14419:14420 -> <init>
-    1885:1886:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14414:14415 -> <init>
-    1887:1890:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14407:14410 -> <init>
-    1891:1899:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14394:14402 -> <init>
-    1900:1903:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14386:14389 -> <init>
-    1904:1912:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14373:14381 -> <init>
-    1913:1914:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14367:14368 -> <init>
-    1915:2033:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14362:14480 -> <init>
-    2034:2055:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14478:14499 -> <init>
-    2056:2071:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14484:14499 -> <init>
-    1:1:boolean hasOldFlags():14567:14567 -> A
-    1:1:boolean hasReceiverType():14662:14662 -> B
-    1:1:boolean hasReceiverTypeId():14677:14677 -> C
-    1:1:boolean hasReturnType():14597:14597 -> D
-    1:1:boolean hasReturnTypeId():14612:14612 -> E
-    1:1:boolean hasTypeTable():14727:14727 -> F
-    1:12:void initFields():14786:14797 -> G
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():15024:15024 -> H
-    1:1:int access$13502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14313:14313 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$13802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14313:14313 -> a
-    3:3:java.util.List access$14000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14313:14313 -> a
-    4:4:java.util.List access$14002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14313:14313 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$14402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):14313:14313 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract access$14602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):14313:14313 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getDefaultInstanceForType():14331:14331 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():14313 -> a
-    8:49:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):14855:14896 -> a
-    1:1:int access$13602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14313:14313 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$14102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14313:14313 -> b
-    3:3:java.util.List access$14300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14313:14313 -> b
-    4:4:java.util.List access$14302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14313:14313 -> b
-    5:5:boolean isInitialized():14801:14801 -> b
-    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.hasName():14582:14582 -> b
-    6:6:boolean isInitialized():14805 -> b
-    7:10:boolean isInitialized():14806:14809 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getReturnType():14603:14603 -> b
-    11:11:boolean isInitialized():14810 -> b
-    12:13:boolean isInitialized():14810:14811 -> b
-    14:14:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getTypeParameterCount():14640:14640 -> b
-    14:14:boolean isInitialized():14815 -> b
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getTypeParameter(int):14646:14646 -> b
-    15:15:boolean isInitialized():14816 -> b
-    16:21:boolean isInitialized():14816:14821 -> b
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getReceiverType():14668:14668 -> b
-    22:22:boolean isInitialized():14822 -> b
-    23:24:boolean isInitialized():14822:14823 -> b
-    25:25:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getValueParameterCount():14705:14705 -> b
-    25:25:boolean isInitialized():14827 -> b
-    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getValueParameter(int):14711:14711 -> b
-    26:26:boolean isInitialized():14828 -> b
-    27:28:boolean isInitialized():14828:14829 -> b
-    29:29:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.hasTypeTable():14727:14727 -> b
-    29:29:boolean isInitialized():14833 -> b
-    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getTypeTable():14733:14733 -> b
-    30:30:boolean isInitialized():14834 -> b
-    31:36:boolean isInitialized():14834:14839 -> b
-    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getContract():14782:14782 -> b
-    37:37:boolean isInitialized():14840 -> b
-    38:47:boolean isInitialized():14840:14849 -> b
-    1:1:int access$13702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14313:14313 -> c
-    2:2:java.util.List access$14500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14313:14313 -> c
-    3:3:java.util.List access$14502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14313:14313 -> c
-    4:51:int getSerializedSize():14901:14948 -> c
-    52:52:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getVersionRequirementList():14747:14747 -> c
-    52:52:int getSerializedSize():14952 -> c
-    53:61:int getSerializedSize():14952:14960 -> c
-    1:1:int access$13902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14313:14313 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$14800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14313:14313 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder():15024:15024 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilderForType():15025 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():14313 -> d
-    1:1:int access$14202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14313:14313 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder():15024:15024 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15027 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.toBuilder():15029 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():14313 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15027:15027 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.toBuilder():15029 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():14313 -> e
-    1:1:int access$14702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14313:14313 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14782:14782 -> k
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstance():14327:14327 -> l
-    1:1:int getFlags():14558:14558 -> m
-    1:1:int getName():14588:14588 -> n
-    1:1:int getOldFlags():14573:14573 -> o
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14668:14668 -> p
-    1:1:int getReceiverTypeId():14683:14683 -> q
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14603:14603 -> r
-    1:1:int getReturnTypeId():14618:14618 -> s
-    1:1:java.util.List getTypeParameterList():14627:14627 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14733:14733 -> u
-    1:1:java.util.List getValueParameterList():14692:14692 -> v
-    1:1:java.util.List getVersionRequirementList():14747:14747 -> w
-    1:1:boolean hasContract():14776:14776 -> x
-    1:1:boolean hasFlags():14538:14538 -> y
-    1:1:boolean hasName():14582:14582 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.ox:
-    1:1:void <init>():14503:14503 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14508:14508 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14503 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.px:
+    1:1596:void <clinit>():14520:16115 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14331:14331 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):14331:14331 -> <init>
+    3:584:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14338:14919 -> <init>
+    585:585:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14339:14339 -> <init>
+    586:1165:void <init>(boolean):14341:14341 -> <init>
+    1166:1729:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14356:14919 -> <init>
+    1730:1863:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14357:14490 -> <init>
+    1864:1873:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14468:14477 -> <init>
+    1874:1877:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14461:14464 -> <init>
+    1878:1886:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14448:14456 -> <init>
+    1887:1888:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14442:14443 -> <init>
+    1889:1890:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14437:14438 -> <init>
+    1891:1892:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14432:14433 -> <init>
+    1893:1896:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14425:14428 -> <init>
+    1897:1905:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14412:14420 -> <init>
+    1906:1909:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14404:14407 -> <init>
+    1910:1918:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14391:14399 -> <init>
+    1919:1920:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14385:14386 -> <init>
+    1921:2039:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14380:14498 -> <init>
+    2040:2061:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14496:14517 -> <init>
+    2062:2077:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14502:14517 -> <init>
+    1:1:boolean hasOldFlags():14587:14587 -> A
+    1:1:boolean hasReceiverType():14682:14682 -> B
+    1:1:boolean hasReceiverTypeId():14697:14697 -> C
+    1:1:boolean hasReturnType():14617:14617 -> D
+    1:1:boolean hasReturnTypeId():14632:14632 -> E
+    1:1:boolean hasTypeTable():14747:14747 -> F
+    1:12:void initFields():14806:14817 -> G
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():15044:15044 -> H
+    1:1:int access$13502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14331:14331 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$13802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14331:14331 -> a
+    3:3:java.util.List access$14000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14331:14331 -> a
+    4:4:java.util.List access$14002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14331:14331 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$14402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):14331:14331 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract access$14602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):14331:14331 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getDefaultInstanceForType():14349:14349 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():14331 -> a
+    8:49:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):14875:14916 -> a
+    1:1:int access$13602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14331:14331 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$14102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):14331:14331 -> b
+    3:3:java.util.List access$14300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14331:14331 -> b
+    4:4:java.util.List access$14302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14331:14331 -> b
+    5:5:boolean isInitialized():14821:14821 -> b
+    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.hasName():14602:14602 -> b
+    6:6:boolean isInitialized():14825 -> b
+    7:10:boolean isInitialized():14826:14829 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getReturnType():14623:14623 -> b
+    11:11:boolean isInitialized():14830 -> b
+    12:13:boolean isInitialized():14830:14831 -> b
+    14:14:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getTypeParameterCount():14660:14660 -> b
+    14:14:boolean isInitialized():14835 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getTypeParameter(int):14666:14666 -> b
+    15:15:boolean isInitialized():14836 -> b
+    16:21:boolean isInitialized():14836:14841 -> b
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getReceiverType():14688:14688 -> b
+    22:22:boolean isInitialized():14842 -> b
+    23:24:boolean isInitialized():14842:14843 -> b
+    25:25:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getValueParameterCount():14725:14725 -> b
+    25:25:boolean isInitialized():14847 -> b
+    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getValueParameter(int):14731:14731 -> b
+    26:26:boolean isInitialized():14848 -> b
+    27:28:boolean isInitialized():14848:14849 -> b
+    29:29:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.hasTypeTable():14747:14747 -> b
+    29:29:boolean isInitialized():14853 -> b
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getTypeTable():14753:14753 -> b
+    30:30:boolean isInitialized():14854 -> b
+    31:36:boolean isInitialized():14854:14859 -> b
+    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getContract():14802:14802 -> b
+    37:37:boolean isInitialized():14860 -> b
+    38:47:boolean isInitialized():14860:14869 -> b
+    1:1:int access$13702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14331:14331 -> c
+    2:2:java.util.List access$14500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14331:14331 -> c
+    3:3:java.util.List access$14502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,java.util.List):14331:14331 -> c
+    4:51:int getSerializedSize():14921:14968 -> c
+    52:52:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.getVersionRequirementList():14767:14767 -> c
+    52:52:int getSerializedSize():14972 -> c
+    53:61:int getSerializedSize():14972:14980 -> c
+    1:1:int access$13902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14331:14331 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$14800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):14331:14331 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder():15044:15044 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilderForType():15045 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():14331 -> d
+    1:1:int access$14202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14331:14331 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder():15044:15044 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15047 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.toBuilder():15049 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():14331 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15047:15047 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.toBuilder():15049 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():14331 -> e
+    1:1:int access$14702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,int):14331:14331 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getContract():14802:14802 -> k
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstance():14345:14345 -> l
+    1:1:int getFlags():14578:14578 -> m
+    1:1:int getName():14608:14608 -> n
+    1:1:int getOldFlags():14593:14593 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():14688:14688 -> p
+    1:1:int getReceiverTypeId():14703:14703 -> q
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():14623:14623 -> r
+    1:1:int getReturnTypeId():14638:14638 -> s
+    1:1:java.util.List getTypeParameterList():14647:14647 -> t
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():14753:14753 -> u
+    1:1:java.util.List getValueParameterList():14712:14712 -> v
+    1:1:java.util.List getVersionRequirementList():14767:14767 -> w
+    1:1:boolean hasContract():14796:14796 -> x
+    1:1:boolean hasFlags():14557:14557 -> y
+    1:1:boolean hasName():14602:14602 -> z
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.Gx:
+    1:1:void <init>():14521:14521 -> <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):14526:14526 -> 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):14521 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.Hx:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -61117,103 +61462,103 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType_ -> h
     java.util.List typeParameter_ -> j
     java.util.List valueParameter_ -> m
-    1:987:void <init>():15040:16026 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):15034:15034 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15155:15157 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setFlags(int):15345:15346 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15157 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15159:15160 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setOldFlags(int):15391:15392 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15160 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15162:15163 -> a
-    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setName(int):15423:15424 -> a
-    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15163 -> a
-    15:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15165:15166 -> a
-    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15477:15479 -> a
-    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15166 -> a
+    1:991:void <init>():15060:16050 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):15054:15054 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15175:15177 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setFlags(int):15368:15369 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15177 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15179:15180 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setOldFlags(int):15415:15416 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15180 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15182:15183 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setName(int):15447:15448 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15183 -> a
+    15:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15185:15186 -> a
+    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15501:15503 -> a
+    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15186 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15479 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15166 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15503 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15186 -> a
     21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15479 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15166 -> a
-    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15479:15485 -> a
-    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15166 -> a
-    29:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15168:15169 -> a
-    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setReturnTypeId(int):15515:15516 -> a
-    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15169 -> a
-    33:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15171:15182 -> a
-    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15694:15696 -> a
-    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15182 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15503 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15186 -> a
+    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15503:15509 -> a
+    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15186 -> a
+    29:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15188:15189 -> a
+    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setReturnTypeId(int):15539:15540 -> a
+    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15189 -> a
+    33:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15191:15202 -> a
+    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15718:15720 -> a
+    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15202 -> a
     48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15696 -> a
-    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15182 -> a
+    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15720 -> a
+    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15202 -> a
     49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15696 -> a
-    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15182 -> a
-    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15696:15702 -> a
-    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15182 -> a
-    57:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15184:15185 -> a
-    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setReceiverTypeId(int):15732:15733 -> a
-    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15185 -> a
-    61:72:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15187:15198 -> a
-    73:75:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15911:15913 -> a
-    73:75:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15198 -> a
-    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():12993:12993 -> a
-    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996 -> a
-    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15913 -> a
-    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15198 -> a
-    77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> a
-    77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15913 -> a
-    77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15198 -> a
-    78:84:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15913:15919 -> a
-    78:84:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15198 -> a
-    85:96:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15200:15211 -> a
-    97:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16065:16067 -> a
-    97:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15211 -> a
-    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder():23541:23541 -> a
-    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544 -> a
-    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16067 -> a
-    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15211 -> a
-    101:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544:23544 -> a
-    101:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16067 -> a
-    101:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15211 -> a
-    102:108:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16067:16073 -> a
-    102:108:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15211 -> a
-    109:110:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15213:15214 -> a
-    111:117:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15273:15279 -> a
-    111:117:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15034 -> a
-    118:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15275:15279 -> a
-    118:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15034 -> a
-    123:124:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):15610:15611 -> a
-    125:127:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15675:15677 -> a
-    128:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):15827:15828 -> a
-    130:131:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addVersionRequirement(int):15992:15993 -> a
-    132:134:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16046:16048 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setFlags(int):15345:15346 -> b
-    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15458:15460 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():15034:15034 -> c
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setName(int):15423:15424 -> c
-    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():15047:15047 -> clone
-    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.clone():15080 -> clone
-    1:1:java.lang.Object clone():15034 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.clone():15080:15080 -> clone
-    2:2:java.lang.Object clone():15034 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.getDefaultInstanceForType():15084:15084 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():15034 -> d
-    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():15047:15047 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13300():15034 -> g
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15088:15089 -> h
+    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15720 -> a
+    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15202 -> a
+    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15720:15726 -> a
+    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15202 -> a
+    57:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15204:15205 -> a
+    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.setReceiverTypeId(int):15756:15757 -> a
+    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15205 -> a
+    61:72:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15207:15218 -> a
+    73:75:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15935:15937 -> a
+    73:75:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15218 -> a
+    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():13001:13001 -> a
+    76:76: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):13004 -> a
+    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15937 -> a
+    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15218 -> a
+    77:77: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):13004:13004 -> a
+    77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15937 -> a
+    77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15218 -> a
+    78:84:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):15937:15943 -> a
+    78:84:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15218 -> a
+    85:96:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15220:15231 -> a
+    97:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16089:16091 -> a
+    97:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15231 -> a
+    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder():23565:23565 -> a
+    100:100: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):23568 -> a
+    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16091 -> a
+    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15231 -> a
+    101:101: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):23568:23568 -> a
+    101:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16091 -> a
+    101:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15231 -> a
+    102:108:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16091:16097 -> a
+    102:108:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15231 -> a
+    109:110:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function):15233:15234 -> a
+    111:117:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15293:15299 -> a
+    111:117:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15054 -> a
+    118:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15295:15299 -> a
+    118:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15054 -> a
+    123:124:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):15634:15635 -> a
+    125:127:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15699:15701 -> a
+    128:129:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):15851:15852 -> a
+    130:131:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder addVersionRequirement(int):16016:16017 -> a
+    132:134:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setContract(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):16070:16072 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setFlags(int):15368:15369 -> b
+    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15482:15484 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():15054:15054 -> c
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setName(int):15447:15448 -> c
+    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():15067:15067 -> clone
+    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.clone():15100 -> clone
+    1:1:java.lang.Object clone():15054 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.clone():15100:15100 -> clone
+    2:2:java.lang.Object clone():15054 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.getDefaultInstanceForType():15104:15104 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():15054 -> d
+    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():15067:15067 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13300():15054 -> g
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15108:15109 -> h
     3:3: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 -> h
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15090 -> h
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15090:15090 -> h
-    1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15096:15150 -> i
-    1:3:void ensureTypeParameterIsMutable():15533:15535 -> j
-    1:3:void ensureValueParameterIsMutable():15750:15752 -> k
-    1:3:void ensureVersionRequirementIsMutable():15934:15936 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.rx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15110 -> h
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15110:15110 -> h
+    1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15116:15170 -> i
+    1:3:void ensureTypeParameterIsMutable():15557:15559 -> j
+    1:3:void ensureValueParameterIsMutable():15774:15776 -> k
+    1:3:void ensureVersionRequirementIsMutable():15958:15960 -> l
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.Jx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind FAKE_OVERRIDE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> d
@@ -61225,7 +61570,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.sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.Kx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality ABSTRACT -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality FINAL -> b
@@ -61237,7 +61582,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.vx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.Nx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -61249,140 +61594,140 @@
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> l
-    1:997:void <clinit>():11683:12679 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):11558:11558 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):11558:11558 -> <init>
-    3:342:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):11565:11904 -> <init>
-    343:343:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):11566:11566 -> <init>
-    344:681:void <init>(boolean):11568:11568 -> <init>
-    682:1003:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11583:11904 -> <init>
-    1004:1073:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11584:11653 -> <init>
-    1074:1082:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11632:11640 -> <init>
-    1083:1086:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11624:11627 -> <init>
-    1087:1090:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11616:11619 -> <init>
-    1091:1144:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11608:11661 -> <init>
-    1145:1166:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11659:11680 -> <init>
-    1167:1182:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11665:11680 -> <init>
-    1:1:java.util.List access$11000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11558:11558 -> a
-    2:2:java.util.List access$11002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11558:11558 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$11302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11558:11558 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$11402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11558:11558 -> a
-    5:5:int access$11502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,int):11558:11558 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getDefaultInstanceForType():11576:11576 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():11558 -> a
-    7:27:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):11881:11901 -> a
-    1:1:java.util.List access$11100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11558:11558 -> b
-    2:2:java.util.List access$11102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11558:11558 -> b
-    3:3:boolean isInitialized():11843:11843 -> b
-    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getFunctionCount():11718:11718 -> b
-    4:4:boolean isInitialized():11847 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getFunction(int):11724:11724 -> b
-    5:5:boolean isInitialized():11848 -> b
-    6:7:boolean isInitialized():11848:11849 -> b
-    8:8:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getPropertyCount():11753:11753 -> b
-    8:8:boolean isInitialized():11853 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getProperty(int):11759:11759 -> b
-    9:9:boolean isInitialized():11854 -> b
-    10:11:boolean isInitialized():11854:11855 -> b
-    12:12:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getTypeAliasCount():11788:11788 -> b
-    12:12:boolean isInitialized():11859 -> b
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getTypeAlias(int):11794:11794 -> b
-    13:13:boolean isInitialized():11860 -> b
-    14:15:boolean isInitialized():11860:11861 -> b
-    16:16:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.hasTypeTable():11810:11810 -> b
-    16:16:boolean isInitialized():11865 -> b
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getTypeTable():11816:11816 -> b
-    17:17:boolean isInitialized():11866 -> b
-    18:27:boolean isInitialized():11866:11875 -> b
-    1:1:java.util.List access$11200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11558:11558 -> c
-    2:2:java.util.List access$11202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11558:11558 -> c
-    3:29:int getSerializedSize():11906:11932 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$11600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11558:11558 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.newBuilder():11996:11996 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.newBuilderForType():11997 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():11558 -> d
-    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.newBuilder():11996:11996 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11999 -> e
-    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.toBuilder():12001 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():11558 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11999:11999 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.toBuilder():12001 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():11558 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstance():11572:11572 -> k
-    1:1:java.util.List getFunctionList():11705:11705 -> l
-    1:1:java.util.List getPropertyList():11740:11740 -> m
-    1:1:java.util.List getTypeAliasList():11775:11775 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():11816:11816 -> o
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():11831:11831 -> p
-    1:1:boolean hasTypeTable():11810:11810 -> q
-    1:1:boolean hasVersionRequirementTable():11825:11825 -> r
-    1:5:void initFields():11835:11839 -> s
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():11996:11996 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.tx:
-    1:1:void <init>():11684:11684 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11689:11689 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11684 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.ux:
+    1:997:void <clinit>():11691:12687 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):11566:11566 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):11566:11566 -> <init>
+    3:342:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):11573:11912 -> <init>
+    343:343:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):11574:11574 -> <init>
+    344:681:void <init>(boolean):11576:11576 -> <init>
+    682:1003:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11591:11912 -> <init>
+    1004:1073:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11592:11661 -> <init>
+    1074:1082:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11640:11648 -> <init>
+    1083:1086:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11632:11635 -> <init>
+    1087:1090:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11624:11627 -> <init>
+    1091:1144:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11616:11669 -> <init>
+    1145:1166:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11667:11688 -> <init>
+    1167:1182:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11673:11688 -> <init>
+    1:1:java.util.List access$11000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11566:11566 -> a
+    2:2:java.util.List access$11002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11566:11566 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable access$11302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):11566:11566 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable access$11402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11566:11566 -> a
+    5:5:int access$11502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,int):11566:11566 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getDefaultInstanceForType():11584:11584 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():11566 -> a
+    7:27:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):11889:11909 -> a
+    1:1:java.util.List access$11100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11566:11566 -> b
+    2:2:java.util.List access$11102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11566:11566 -> b
+    3:3:boolean isInitialized():11851:11851 -> b
+    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getFunctionCount():11726:11726 -> b
+    4:4:boolean isInitialized():11855 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getFunction(int):11732:11732 -> b
+    5:5:boolean isInitialized():11856 -> b
+    6:7:boolean isInitialized():11856:11857 -> b
+    8:8:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getPropertyCount():11761:11761 -> b
+    8:8:boolean isInitialized():11861 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getProperty(int):11767:11767 -> b
+    9:9:boolean isInitialized():11862 -> b
+    10:11:boolean isInitialized():11862:11863 -> b
+    12:12:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getTypeAliasCount():11796:11796 -> b
+    12:12:boolean isInitialized():11867 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getTypeAlias(int):11802:11802 -> b
+    13:13:boolean isInitialized():11868 -> b
+    14:15:boolean isInitialized():11868:11869 -> b
+    16:16:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.hasTypeTable():11818:11818 -> b
+    16:16:boolean isInitialized():11873 -> b
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.getTypeTable():11824:11824 -> b
+    17:17:boolean isInitialized():11874 -> b
+    18:27:boolean isInitialized():11874:11883 -> b
+    1:1:java.util.List access$11200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11566:11566 -> c
+    2:2:java.util.List access$11202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package,java.util.List):11566:11566 -> c
+    3:29:int getSerializedSize():11914:11940 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$11600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):11566:11566 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.newBuilder():12004:12004 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.newBuilderForType():12005 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():11566 -> d
+    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.newBuilder():12004:12004 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12007 -> e
+    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.toBuilder():12009 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():11566 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12007:12007 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.toBuilder():12009 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():11566 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstance():11580:11580 -> k
+    1:1:java.util.List getFunctionList():11713:11713 -> l
+    1:1:java.util.List getPropertyList():11748:11748 -> m
+    1:1:java.util.List getTypeAliasList():11783:11783 -> n
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():11824:11824 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():11839:11839 -> p
+    1:1:boolean hasTypeTable():11818:11818 -> q
+    1:1:boolean hasVersionRequirementTable():11833:11833 -> r
+    1:5:void initFields():11843:11847 -> s
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():12004:12004 -> t
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.Lx:
+    1:1:void <init>():11692:11692 -> <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):11697:11697 -> 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):11692 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.Mx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
     int bitField0_ -> d
     java.util.List typeAlias_ -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> h
-    1:603:void <init>():12012:12614 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):12006:12006 -> a
-    2:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12085:12117 -> a
-    35:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12593:12595 -> a
-    35:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():12993:12993 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> a
-    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595 -> a
-    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    40:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595:12601 -> a
-    40:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    47:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12119:12120 -> a
-    49:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12653:12655 -> a
-    49:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder():22167:22167 -> a
-    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170 -> a
-    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655 -> a
-    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> a
-    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655 -> a
-    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    54:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655:12661 -> a
-    54:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    61:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12122:12123 -> a
-    63:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12166:12172 -> a
-    63:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12006 -> a
-    70:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12168:12172 -> a
-    70:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12006 -> a
-    75:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12259:12260 -> a
-    77:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12384:12385 -> a
-    79:80:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12509:12510 -> a
-    81:83:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12634:12636 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():12006:12006 -> c
-    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():12019:12019 -> clone
-    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.clone():12038 -> clone
-    1:1:java.lang.Object clone():12006 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.clone():12038:12038 -> clone
-    2:2:java.lang.Object clone():12006 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.getDefaultInstanceForType():12042:12042 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():12006 -> d
-    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():12019:12019 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$10800():12006 -> g
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12046:12047 -> h
+    1:603:void <init>():12020:12622 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):12014:12014 -> a
+    2:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12093:12125 -> a
+    35:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12601:12603 -> a
+    35:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12125 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():13001:13001 -> a
+    38:38: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):13004 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12603 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12125 -> a
+    39:39: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):13004:13004 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12603 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12125 -> a
+    40:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12603:12609 -> a
+    40:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12125 -> a
+    47:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12127:12128 -> a
+    49:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12661:12663 -> a
+    49:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12128 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder():22191:22191 -> a
+    52:52: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):22194 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12663 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12128 -> a
+    53:53: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):22194:22194 -> a
+    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12663 -> a
+    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12128 -> a
+    54:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12663:12669 -> a
+    54:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12128 -> a
+    61:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12130:12131 -> a
+    63:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12174:12180 -> a
+    63:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12014 -> a
+    70:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12176:12180 -> a
+    70:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12014 -> a
+    75:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12267:12268 -> a
+    77:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12392:12393 -> a
+    79:80:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12517:12518 -> a
+    81:83:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12642:12644 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():12014:12014 -> c
+    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():12027:12027 -> clone
+    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.clone():12046 -> clone
+    1:1:java.lang.Object clone():12014 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.clone():12046:12046 -> clone
+    2:2:java.lang.Object clone():12014 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.getDefaultInstanceForType():12050:12050 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():12014 -> d
+    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():12027:12027 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$10800():12014 -> g
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12054:12055 -> h
     3:3: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 -> h
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12048 -> h
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12048:12048 -> h
-    1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12054:12080 -> i
-    1:3:void ensureFunctionIsMutable():12182:12184 -> j
-    1:3:void ensurePropertyIsMutable():12307:12309 -> k
-    1:3:void ensureTypeAliasIsMutable():12432:12434 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.yx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12056 -> h
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12056:12056 -> h
+    1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12062:12088 -> i
+    1:3:void ensureFunctionIsMutable():12190:12192 -> j
+    1:3:void ensurePropertyIsMutable():12315:12317 -> k
+    1:3:void ensureTypeAliasIsMutable():12440:12442 -> l
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.Qx:
     int setterFlags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -61401,109 +61746,109 @@
     byte memoizedIsInitialized -> p
     java.util.List typeParameter_ -> i
     int memoizedSerializedSize -> q
-    1:1501:void <clinit>():16465:17965 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16290:16290 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16290:16290 -> <init>
-    3:564:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):16297:16858 -> <init>
-    565:565:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):16298:16298 -> <init>
-    566:1125:void <init>(boolean):16300:16300 -> <init>
-    1126:1669:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16315:16858 -> <init>
-    1670:1792:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16316:16438 -> <init>
-    1793:1796:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16422:16425 -> <init>
-    1797:1798:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16416:16417 -> <init>
-    1799:1800:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16411:16412 -> <init>
-    1801:1802:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16406:16407 -> <init>
-    1803:1804:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16401:16402 -> <init>
-    1805:1806:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16396:16397 -> <init>
-    1807:1815:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16384:16392 -> <init>
-    1816:1824:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16371:16379 -> <init>
-    1825:1828:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16363:16366 -> <init>
-    1829:1837:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16350:16358 -> <init>
-    1838:1839:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16344:16345 -> <init>
-    1840:1947:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16339:16446 -> <init>
-    1948:1966:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16444:16462 -> <init>
-    1967:1979:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16450:16462 -> <init>
-    1:1:boolean hasOldFlags():16534:16534 -> A
-    1:1:boolean hasReceiverType():16629:16629 -> B
-    1:1:boolean hasReceiverTypeId():16644:16644 -> C
-    1:1:boolean hasReturnType():16564:16564 -> D
-    1:1:boolean hasReturnTypeId():16579:16579 -> E
-    1:1:boolean hasSetterFlags():16713:16713 -> F
-    1:1:boolean hasSetterValueParameter():16659:16659 -> G
-    1:12:void initFields():16757:16768 -> H
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():16983:16983 -> I
-    1:1:int access$15202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16290:16290 -> a
-    3:3:java.util.List access$15700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16290:16290 -> a
-    4:4:java.util.List access$15702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16290:16290 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter access$16002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):16290:16290 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstanceForType():16308:16308 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():16290 -> a
-    7:48:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):16814:16855 -> a
-    1:1:int access$15302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16290:16290 -> b
-    3:3:java.util.List access$16300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16290:16290 -> b
-    4:4:java.util.List access$16302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16290:16290 -> b
-    5:5:boolean isInitialized():16772:16772 -> b
-    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.hasName():16549:16549 -> b
-    6:6:boolean isInitialized():16776 -> b
-    7:10:boolean isInitialized():16777:16780 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getReturnType():16570:16570 -> b
-    11:11:boolean isInitialized():16781 -> b
-    12:13:boolean isInitialized():16781:16782 -> b
-    14:14:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getTypeParameterCount():16607:16607 -> b
-    14:14:boolean isInitialized():16786 -> b
-    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getTypeParameter(int):16613:16613 -> b
-    15:15:boolean isInitialized():16787 -> b
-    16:21:boolean isInitialized():16787:16792 -> b
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getReceiverType():16635:16635 -> b
-    22:22:boolean isInitialized():16793 -> b
-    23:28:boolean isInitialized():16793:16798 -> b
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getSetterValueParameter():16665:16665 -> b
-    29:29:boolean isInitialized():16799 -> b
-    30:39:boolean isInitialized():16799:16808 -> b
-    1:1:int access$15402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$16500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16290:16290 -> c
-    3:54:int getSerializedSize():16860:16911 -> c
-    55:55:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getVersionRequirementList():16733:16733 -> c
-    55:55:int getSerializedSize():16915 -> c
-    56:60:int getSerializedSize():16915:16919 -> c
-    1:1:int access$15602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder():16983:16983 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilderForType():16984 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():16290 -> d
-    1:1:int access$15902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder():16983:16983 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16986 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.toBuilder():16988 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():16290 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16986:16986 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.toBuilder():16988 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():16290 -> e
-    1:1:int access$16102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> f
-    1:1:int access$16202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> g
-    1:1:int access$16402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16290:16290 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstance():16304:16304 -> k
-    1:1:int getFlags():16525:16525 -> l
-    1:1:int getGetterFlags():16704:16704 -> m
-    1:1:int getName():16555:16555 -> n
-    1:1:int getOldFlags():16540:16540 -> o
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16635:16635 -> p
-    1:1:int getReceiverTypeId():16650:16650 -> q
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16570:16570 -> r
-    1:1:int getReturnTypeId():16585:16585 -> s
-    1:1:int getSetterFlags():16719:16719 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16665:16665 -> u
-    1:1:java.util.List getTypeParameterList():16594:16594 -> v
-    1:1:java.util.List getVersionRequirementList():16733:16733 -> w
-    1:1:boolean hasFlags():16503:16503 -> x
-    1:1:boolean hasGetterFlags():16686:16686 -> y
-    1:1:boolean hasName():16549:16549 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.wx:
-    1:1:void <init>():16466:16466 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16471:16471 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16466 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.xx:
+    1:1501:void <clinit>():16489:17989 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16314:16314 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):16314:16314 -> <init>
+    3:564:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):16321:16882 -> <init>
+    565:565:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):16322:16322 -> <init>
+    566:1125:void <init>(boolean):16324:16324 -> <init>
+    1126:1669:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16339:16882 -> <init>
+    1670:1792:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16340:16462 -> <init>
+    1793:1796:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16446:16449 -> <init>
+    1797:1798:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16440:16441 -> <init>
+    1799:1800:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16435:16436 -> <init>
+    1801:1802:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16430:16431 -> <init>
+    1803:1804:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16425:16426 -> <init>
+    1805:1806:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16420:16421 -> <init>
+    1807:1815:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16408:16416 -> <init>
+    1816:1824:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16395:16403 -> <init>
+    1825:1828:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16387:16390 -> <init>
+    1829:1837:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16374:16382 -> <init>
+    1838:1839:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16368:16369 -> <init>
+    1840:1947:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16363:16470 -> <init>
+    1948:1966:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16468:16486 -> <init>
+    1967:1979:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16474:16486 -> <init>
+    1:1:boolean hasOldFlags():16558:16558 -> A
+    1:1:boolean hasReceiverType():16653:16653 -> B
+    1:1:boolean hasReceiverTypeId():16668:16668 -> C
+    1:1:boolean hasReturnType():16588:16588 -> D
+    1:1:boolean hasReturnTypeId():16603:16603 -> E
+    1:1:boolean hasSetterFlags():16737:16737 -> F
+    1:1:boolean hasSetterValueParameter():16683:16683 -> G
+    1:12:void initFields():16781:16792 -> H
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():17007:17007 -> I
+    1:1:int access$15202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16314:16314 -> a
+    3:3:java.util.List access$15700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16314:16314 -> a
+    4:4:java.util.List access$15702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16314:16314 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter access$16002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):16314:16314 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstanceForType():16332:16332 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():16314 -> a
+    7:48:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):16838:16879 -> a
+    1:1:int access$15302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$15802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):16314:16314 -> b
+    3:3:java.util.List access$16300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16314:16314 -> b
+    4:4:java.util.List access$16302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,java.util.List):16314:16314 -> b
+    5:5:boolean isInitialized():16796:16796 -> b
+    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.hasName():16573:16573 -> b
+    6:6:boolean isInitialized():16800 -> b
+    7:10:boolean isInitialized():16801:16804 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getReturnType():16594:16594 -> b
+    11:11:boolean isInitialized():16805 -> b
+    12:13:boolean isInitialized():16805:16806 -> b
+    14:14:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getTypeParameterCount():16631:16631 -> b
+    14:14:boolean isInitialized():16810 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getTypeParameter(int):16637:16637 -> b
+    15:15:boolean isInitialized():16811 -> b
+    16:21:boolean isInitialized():16811:16816 -> b
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getReceiverType():16659:16659 -> b
+    22:22:boolean isInitialized():16817 -> b
+    23:28:boolean isInitialized():16817:16822 -> b
+    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getSetterValueParameter():16689:16689 -> b
+    29:29:boolean isInitialized():16823 -> b
+    30:39:boolean isInitialized():16823:16832 -> b
+    1:1:int access$15402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$16500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):16314:16314 -> c
+    3:54:int getSerializedSize():16884:16935 -> c
+    55:55:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.getVersionRequirementList():16757:16757 -> c
+    55:55:int getSerializedSize():16939 -> c
+    56:60:int getSerializedSize():16939:16943 -> c
+    1:1:int access$15602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder():17007:17007 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilderForType():17008 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():16314 -> d
+    1:1:int access$15902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder():17007:17007 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17010 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.toBuilder():17012 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():16314 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17010:17010 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property.toBuilder():17012 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():16314 -> e
+    1:1:int access$16102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> f
+    1:1:int access$16202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> g
+    1:1:int access$16402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,int):16314:16314 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getDefaultInstance():16328:16328 -> k
+    1:1:int getFlags():16549:16549 -> l
+    1:1:int getGetterFlags():16728:16728 -> m
+    1:1:int getName():16579:16579 -> n
+    1:1:int getOldFlags():16564:16564 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReceiverType():16659:16659 -> p
+    1:1:int getReceiverTypeId():16674:16674 -> q
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getReturnType():16594:16594 -> r
+    1:1:int getReturnTypeId():16609:16609 -> s
+    1:1:int getSetterFlags():16743:16743 -> t
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getSetterValueParameter():16689:16689 -> u
+    1:1:java.util.List getTypeParameterList():16618:16618 -> v
+    1:1:java.util.List getVersionRequirementList():16757:16757 -> w
+    1:1:boolean hasFlags():16527:16527 -> x
+    1:1:boolean hasGetterFlags():16710:16710 -> y
+    1:1:boolean hasName():16573:16573 -> z
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.Ox:
+    1:1:void <init>():16490:16490 -> <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):16495:16495 -> 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):16490 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.Px:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -61517,97 +61862,97 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType_ -> h
     java.util.List typeParameter_ -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> m
-    1:868:void <init>():16999:17866 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):16993:16993 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17113:17115 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setFlags(int):17290:17291 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17115 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17117:17118 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setOldFlags(int):17338:17339 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17118 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17120:17121 -> a
-    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setName(int):17370:17371 -> a
-    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17121 -> a
-    15:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17123:17124 -> a
-    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17424:17426 -> a
-    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17124 -> a
+    1:868:void <init>():17023:17890 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):17017:17017 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17137:17139 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setFlags(int):17314:17315 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17139 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17141:17142 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setOldFlags(int):17362:17363 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17142 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17144:17145 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setName(int):17394:17395 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17145 -> a
+    15:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17147:17148 -> a
+    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17448:17450 -> a
+    17:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17148 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17426 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17124 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17450 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17148 -> a
     21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17426 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17124 -> a
-    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17426:17432 -> a
-    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17124 -> a
-    29:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17126:17127 -> a
-    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setReturnTypeId(int):17462:17463 -> a
-    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17127 -> a
-    33:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17129:17140 -> a
-    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17641:17643 -> a
-    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17140 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17450 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17148 -> a
+    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17450:17456 -> a
+    22:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17148 -> a
+    29:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17150:17151 -> a
+    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setReturnTypeId(int):17486:17487 -> a
+    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17151 -> a
+    33:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17153:17164 -> a
+    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17665:17667 -> a
+    45:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17164 -> a
     48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17643 -> a
-    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17140 -> a
+    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17667 -> a
+    48:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17164 -> a
     49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17643 -> a
-    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17140 -> a
-    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17643:17649 -> a
-    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17140 -> a
-    57:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17142:17143 -> a
-    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setReceiverTypeId(int):17679:17680 -> a
-    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17143 -> a
-    61:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17145:17146 -> a
-    63:65:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17733:17735 -> a
-    63:65:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17146 -> a
-    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder():18441:18441 -> a
-    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444 -> a
-    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17735 -> a
-    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17146 -> a
-    67:67:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444:18444 -> a
-    67:67:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17735 -> a
-    67:67:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17146 -> a
-    68:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17735:17741 -> a
-    68:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17146 -> a
-    75:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17148:17149 -> a
-    77:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setGetterFlags(int):17807:17808 -> a
-    77:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17149 -> a
-    79:80:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17151:17152 -> a
-    81:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setSetterFlags(int):17851:17852 -> a
-    81:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17152 -> a
-    83:94:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17154:17165 -> a
-    95:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17212:17218 -> a
-    95:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16993 -> a
-    102:106:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17214:17218 -> a
-    102:106:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16993 -> a
-    107:108:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):17557:17558 -> a
-    109:111:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17622:17624 -> a
-    112:114:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17714:17716 -> a
-    115:116:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addVersionRequirement(int):17926:17927 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setFlags(int):17290:17291 -> b
-    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17405:17407 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():16993:16993 -> c
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setGetterFlags(int):17807:17808 -> c
-    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():17006:17006 -> clone
-    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.clone():17039 -> clone
-    1:1:java.lang.Object clone():16993 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.clone():17039:17039 -> clone
-    2:2:java.lang.Object clone():16993 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.getDefaultInstanceForType():17043:17043 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():16993 -> d
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setName(int):17370:17371 -> d
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setSetterFlags(int):17851:17852 -> e
-    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():17006:17006 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15000():16993 -> g
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property build():17047:17048 -> h
+    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17667 -> a
+    49:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17164 -> a
+    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17667:17673 -> a
+    50:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17164 -> a
+    57:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17166:17167 -> a
+    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setReceiverTypeId(int):17703:17704 -> a
+    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17167 -> a
+    61:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17169:17170 -> a
+    63:65:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17757:17759 -> a
+    63:65:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17170 -> a
+    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder():18465:18465 -> a
+    66:66: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):18468 -> a
+    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17759 -> a
+    66:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17170 -> a
+    67:67: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):18468:18468 -> a
+    67:67:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17759 -> a
+    67:67:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17170 -> a
+    68:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17759:17765 -> a
+    68:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17170 -> a
+    75:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17172:17173 -> a
+    77:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setGetterFlags(int):17831:17832 -> a
+    77:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17173 -> a
+    79:80:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17175:17176 -> a
+    81:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.setSetterFlags(int):17875:17876 -> a
+    81:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17176 -> a
+    83:94:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):17178:17189 -> a
+    95:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17236:17242 -> a
+    95:101:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17017 -> a
+    102:106:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17238:17242 -> a
+    102:106:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):17017 -> a
+    107:108:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):17581:17582 -> a
+    109:111:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setReceiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17646:17648 -> a
+    112:114:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setSetterValueParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):17738:17740 -> a
+    115:116:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder addVersionRequirement(int):17950:17951 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setFlags(int):17314:17315 -> b
+    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):17429:17431 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():17017:17017 -> c
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setGetterFlags(int):17831:17832 -> c
+    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():17030:17030 -> clone
+    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.clone():17063 -> clone
+    1:1:java.lang.Object clone():17017 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.clone():17063:17063 -> clone
+    2:2:java.lang.Object clone():17017 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.getDefaultInstanceForType():17067:17067 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():17017 -> d
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setName(int):17394:17395 -> d
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder setSetterFlags(int):17875:17876 -> e
+    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():17030:17030 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15000():17017 -> g
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property build():17071:17072 -> h
     3:3: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 -> h
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property build():17049 -> h
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property build():17049:17049 -> h
-    1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17055:17108 -> i
-    1:3:void ensureTypeParameterIsMutable():17480:17482 -> j
-    1:3:void ensureVersionRequirementIsMutable():17868:17870 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.Fx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property build():17073 -> h
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property build():17073:17073 -> h
+    1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17079:17132 -> i
+    1:3:void ensureTypeParameterIsMutable():17504:17506 -> j
+    1:3:void ensureVersionRequirementIsMutable():17892:17894 -> k
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.Xx:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -61738,11 +62083,11 @@
     1:1:int getTypeParameter():5807:5807 -> x
     1:1:int getTypeParameterName():5830:5830 -> y
     1:1:boolean hasAbbreviatedType():5902:5902 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.zx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.Rx:
     1:1:void <init>():4972:4972 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4977:4977 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4972 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.Dx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.Vx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
@@ -61796,11 +62141,11 @@
     1:1:boolean hasTypeId():5257:5257 -> m
     1:3:void initFields():5267:5269 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5385:5385 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.Ax:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.Sx:
     1:1:void <init>():5124:5124 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5129:5129 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5124 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.Bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.Tx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> d
     int typeId_ -> e
@@ -61844,7 +62189,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.Cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.Ux:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection OUT -> c
@@ -61859,7 +62204,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5184:5184 -> d
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5183:5183 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.Wx:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -61979,7 +62324,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6253:6253 -> h
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> i
     1:3:void ensureArgumentIsMutable():6434:6436 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.Ix:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.ay:
     int memoizedSerializedSize -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
@@ -61995,99 +62340,99 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> p
     java.util.List versionRequirement_ -> l
     java.util.List annotation_ -> k
-    1:1264:void <clinit>():19171:20434 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):19013:19013 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):19013:19013 -> <init>
-    3:464:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):19020:19481 -> <init>
-    465:465:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):19021:19021 -> <init>
-    466:925:void <init>(boolean):19023:19023 -> <init>
-    926:1369:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19038:19481 -> <init>
-    1370:1472:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19039:19141 -> <init>
-    1473:1476:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19125:19128 -> <init>
-    1477:1480:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19117:19120 -> <init>
-    1481:1482:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19111:19112 -> <init>
-    1483:1491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19099:19107 -> <init>
-    1492:1493:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19093:19094 -> <init>
-    1494:1502:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19081:19089 -> <init>
-    1503:1506:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19073:19076 -> <init>
-    1507:1508:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19067:19068 -> <init>
-    1509:1596:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19062:19149 -> <init>
-    1597:1618:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19147:19168 -> <init>
-    1619:1634:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19153:19168 -> <init>
-    1:9:void initFields():19392:19400 -> A
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():19594:19594 -> B
-    1:1:int access$18002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19013:19013 -> a
-    2:2:java.util.List access$18200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19013:19013 -> a
-    3:3:java.util.List access$18202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):19013:19013 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):19013:19013 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getDefaultInstanceForType():19031:19031 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():19013 -> a
-    6:38:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):19446:19478 -> a
-    1:1:int access$18102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19013:19013 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):19013:19013 -> b
-    3:3:java.util.List access$18700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19013:19013 -> b
-    4:4:java.util.List access$18702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):19013:19013 -> b
-    5:5:boolean isInitialized():19404:19404 -> b
-    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.hasName():19218:19218 -> b
-    6:6:boolean isInitialized():19408 -> b
-    7:7:boolean isInitialized():19409:19409 -> b
-    8:8:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getTypeParameterCount():19246:19246 -> b
-    8:8:boolean isInitialized():19412 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getTypeParameter(int):19252:19252 -> b
-    9:9:boolean isInitialized():19413 -> b
-    10:15:boolean isInitialized():19413:19418 -> b
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getUnderlyingType():19274:19274 -> b
-    16:16:boolean isInitialized():19419 -> b
-    17:22:boolean isInitialized():19419:19424 -> b
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getExpandedType():19304:19304 -> b
-    23:23:boolean isInitialized():19425 -> b
-    24:25:boolean isInitialized():19425:19426 -> b
-    26:26:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getAnnotationCount():19341:19341 -> b
-    26:26:boolean isInitialized():19430 -> b
-    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getAnnotation(int):19347:19347 -> b
-    27:27:boolean isInitialized():19431 -> b
-    28:37:boolean isInitialized():19431:19440 -> b
-    1:1:int access$18402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19013:19013 -> c
-    2:2:java.util.List access$18800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19013:19013 -> c
-    3:3:java.util.List access$18802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):19013:19013 -> c
-    4:43:int getSerializedSize():19483:19522 -> c
-    44:44:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getVersionRequirementList():19368:19368 -> c
-    44:44:int getSerializedSize():19526 -> c
-    45:49:int getSerializedSize():19526:19530 -> c
-    1:1:int access$18602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19013:19013 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$19000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19013:19013 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder():19594:19594 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilderForType():19595 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():19013 -> d
-    1:1:int access$18902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19013:19013 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder():19594:19594 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19597 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.toBuilder():19599 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():19013 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19597:19597 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.toBuilder():19599 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():19013 -> e
-    1:1:java.util.List getAnnotationList():19328:19328 -> k
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():19027:19027 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19304:19304 -> m
-    1:1:int getExpandedTypeId():19319:19319 -> n
-    1:1:int getFlags():19209:19209 -> o
-    1:1:int getName():19224:19224 -> p
-    1:1:java.util.List getTypeParameterList():19233:19233 -> q
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19274:19274 -> r
-    1:1:int getUnderlyingTypeId():19289:19289 -> s
-    1:1:java.util.List getVersionRequirementList():19368:19368 -> t
-    1:1:boolean hasExpandedType():19298:19298 -> u
-    1:1:boolean hasExpandedTypeId():19313:19313 -> v
-    1:1:boolean hasFlags():19198:19198 -> w
-    1:1:boolean hasName():19218:19218 -> x
-    1:1:boolean hasUnderlyingType():19268:19268 -> y
-    1:1:boolean hasUnderlyingTypeId():19283:19283 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.Gx:
-    1:1:void <init>():19172:19172 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19177:19177 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19172 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.Hx:
+    1:1264:void <clinit>():19195:20458 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):19037:19037 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):19037:19037 -> <init>
+    3:464:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):19044:19505 -> <init>
+    465:465:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):19045:19045 -> <init>
+    466:925:void <init>(boolean):19047:19047 -> <init>
+    926:1369:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19062:19505 -> <init>
+    1370:1472:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19063:19165 -> <init>
+    1473:1476:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19149:19152 -> <init>
+    1477:1480:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19141:19144 -> <init>
+    1481:1482:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19135:19136 -> <init>
+    1483:1491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19123:19131 -> <init>
+    1492:1493:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19117:19118 -> <init>
+    1494:1502:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19105:19113 -> <init>
+    1503:1506:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19097:19100 -> <init>
+    1507:1508:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19091:19092 -> <init>
+    1509:1596:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19086:19173 -> <init>
+    1597:1618:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19171:19192 -> <init>
+    1619:1634:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19177:19192 -> <init>
+    1:9:void initFields():19416:19424 -> A
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():19618:19618 -> B
+    1:1:int access$18002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19037:19037 -> a
+    2:2:java.util.List access$18200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19037:19037 -> a
+    3:3:java.util.List access$18202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):19037:19037 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):19037:19037 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getDefaultInstanceForType():19055:19055 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():19037 -> a
+    6:38:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):19470:19502 -> a
+    1:1:int access$18102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19037:19037 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$18502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):19037:19037 -> b
+    3:3:java.util.List access$18700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19037:19037 -> b
+    4:4:java.util.List access$18702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):19037:19037 -> b
+    5:5:boolean isInitialized():19428:19428 -> b
+    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.hasName():19242:19242 -> b
+    6:6:boolean isInitialized():19432 -> b
+    7:7:boolean isInitialized():19433:19433 -> b
+    8:8:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getTypeParameterCount():19270:19270 -> b
+    8:8:boolean isInitialized():19436 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getTypeParameter(int):19276:19276 -> b
+    9:9:boolean isInitialized():19437 -> b
+    10:15:boolean isInitialized():19437:19442 -> b
+    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getUnderlyingType():19298:19298 -> b
+    16:16:boolean isInitialized():19443 -> b
+    17:22:boolean isInitialized():19443:19448 -> b
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getExpandedType():19328:19328 -> b
+    23:23:boolean isInitialized():19449 -> b
+    24:25:boolean isInitialized():19449:19450 -> b
+    26:26:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getAnnotationCount():19365:19365 -> b
+    26:26:boolean isInitialized():19454 -> b
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getAnnotation(int):19371:19371 -> b
+    27:27:boolean isInitialized():19455 -> b
+    28:37:boolean isInitialized():19455:19464 -> b
+    1:1:int access$18402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19037:19037 -> c
+    2:2:java.util.List access$18800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19037:19037 -> c
+    3:3:java.util.List access$18802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,java.util.List):19037:19037 -> c
+    4:43:int getSerializedSize():19507:19546 -> c
+    44:44:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.getVersionRequirementList():19392:19392 -> c
+    44:44:int getSerializedSize():19550 -> c
+    45:49:int getSerializedSize():19550:19554 -> c
+    1:1:int access$18602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19037:19037 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$19000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19037:19037 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder():19618:19618 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilderForType():19619 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():19037 -> d
+    1:1:int access$18902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,int):19037:19037 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder():19618:19618 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19621 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.toBuilder():19623 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():19037 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19621:19621 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias.toBuilder():19623 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():19037 -> e
+    1:1:java.util.List getAnnotationList():19352:19352 -> k
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():19051:19051 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getExpandedType():19328:19328 -> m
+    1:1:int getExpandedTypeId():19343:19343 -> n
+    1:1:int getFlags():19233:19233 -> o
+    1:1:int getName():19248:19248 -> p
+    1:1:java.util.List getTypeParameterList():19257:19257 -> q
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getUnderlyingType():19298:19298 -> r
+    1:1:int getUnderlyingTypeId():19313:19313 -> s
+    1:1:java.util.List getVersionRequirementList():19392:19392 -> t
+    1:1:boolean hasExpandedType():19322:19322 -> u
+    1:1:boolean hasExpandedTypeId():19337:19337 -> v
+    1:1:boolean hasFlags():19222:19222 -> w
+    1:1:boolean hasName():19242:19242 -> x
+    1:1:boolean hasUnderlyingType():19292:19292 -> y
+    1:1:boolean hasUnderlyingTypeId():19307:19307 -> z
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.Yx:
+    1:1:void <init>():19196:19196 -> <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):19201:19201 -> 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):19196 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.Zx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> j
     int expandedTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> h
@@ -62098,75 +62443,75 @@
     java.util.List typeParameter_ -> g
     java.util.List versionRequirement_ -> m
     java.util.List annotation_ -> l
-    1:726:void <init>():19610:20335 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):19604:19604 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19707:19709 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setFlags(int):19849:19850 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19709 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19711:19712 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setName(int):19886:19887 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19712 -> a
-    11:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19714:19725 -> a
-    23:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20065:20067 -> a
-    23:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19725 -> a
+    1:726:void <init>():19634:20359 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):19628:19628 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19731:19733 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setFlags(int):19873:19874 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19733 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19735:19736 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setName(int):19910:19911 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19736 -> a
+    11:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19738:19749 -> a
+    23:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20089:20091 -> a
+    23:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19749 -> a
     26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20067 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19725 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20091 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19749 -> a
     27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20067 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19725 -> a
-    28:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20067:20073 -> a
-    28:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19725 -> a
-    35:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19727:19728 -> a
-    37:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setUnderlyingTypeId(int):20103:20104 -> a
-    37:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19728 -> a
-    39:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19730:19731 -> a
-    41:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20157:20159 -> a
-    41:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19731 -> a
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20091 -> a
+    27:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19749 -> a
+    28:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20091:20097 -> a
+    28:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19749 -> a
+    35:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19751:19752 -> a
+    37:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setUnderlyingTypeId(int):20127:20128 -> a
+    37:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19752 -> a
+    39:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19754:19755 -> a
+    41:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20181:20183 -> a
+    41:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19755 -> a
     44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20159 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19731 -> a
+    44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20183 -> a
+    44:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19755 -> a
     45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20159 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19731 -> a
-    46:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20159:20165 -> a
-    46:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19731 -> a
-    53:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19733:19734 -> a
-    55:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setExpandedTypeId(int):20195:20196 -> a
-    55:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19734 -> a
-    57:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19736:19757 -> a
-    79:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19804:19810 -> a
-    79:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19604 -> a
-    86:90:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19806:19810 -> a
-    86:90:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19604 -> a
-    91:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):19981:19982 -> a
-    93:95:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20138:20140 -> a
-    96:97:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder):20290:20291 -> a
-    98:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addVersionRequirement(int):20395:20396 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setFlags(int):19849:19850 -> b
-    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20046:20048 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():19604:19604 -> c
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setName(int):19886:19887 -> c
-    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():19617:19617 -> clone
-    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.clone():19644 -> clone
-    1:1:java.lang.Object clone():19604 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.clone():19644:19644 -> clone
-    2:2:java.lang.Object clone():19604 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.getDefaultInstanceForType():19648:19648 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():19604 -> d
-    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():19617:19617 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$17800():19604 -> g
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19652:19653 -> h
+    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20183 -> a
+    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19755 -> a
+    46:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20183:20189 -> a
+    46:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19755 -> a
+    53:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19757:19758 -> a
+    55:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setExpandedTypeId(int):20219:20220 -> a
+    55:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19758 -> a
+    57:78:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias):19760:19781 -> a
+    79:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19828:19834 -> a
+    79:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19628 -> a
+    86:90:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19830:19834 -> a
+    86:90:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19628 -> a
+    91:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addTypeParameter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):20005:20006 -> a
+    93:95:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setExpandedType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20162:20164 -> a
+    96:97:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder):20314:20315 -> a
+    98:99:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder addVersionRequirement(int):20419:20420 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setFlags(int):19873:19874 -> b
+    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20070:20072 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():19628:19628 -> c
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setName(int):19910:19911 -> c
+    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():19641:19641 -> clone
+    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.clone():19668 -> clone
+    1:1:java.lang.Object clone():19628 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.clone():19668:19668 -> clone
+    2:2:java.lang.Object clone():19628 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.getDefaultInstanceForType():19672:19672 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():19628 -> d
+    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():19641:19641 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$17800():19628 -> g
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19676:19677 -> h
     3:3: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 -> h
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19654 -> h
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19654:19654 -> h
-    1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19660:19702 -> i
-    1:3:void ensureAnnotationIsMutable():20213:20215 -> j
-    1:3:void ensureTypeParameterIsMutable():19904:19906 -> k
-    1:3:void ensureVersionRequirementIsMutable():20337:20339 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.Mx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19678 -> h
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19678:19678 -> h
+    1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19684:19726 -> i
+    1:3:void ensureAnnotationIsMutable():20237:20239 -> j
+    1:3:void ensureTypeParameterIsMutable():19928:19930 -> k
+    1:3:void ensureVersionRequirementIsMutable():20361:20363 -> l
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.ey:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     int upperBoundIdMemoizedSerializedSize -> j
@@ -62251,11 +62596,11 @@
     1:1:boolean hasVariance():7510:7510 -> u
     1:6:void initFields():7578:7583 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7751:7751 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.Jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.by:
     1:1:void <init>():7379:7379 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7384:7384 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7379 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.Kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.cy:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -62303,7 +62648,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter build():7805:7805 -> h
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> i
     1:3:void ensureUpperBoundIsMutable():8059:8061 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.Lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.dy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance OUT -> c
@@ -62316,7 +62661,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7432:7432 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7431:7431 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7430:7430 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.Px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.hy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List type_ -> c
@@ -62325,89 +62670,89 @@
     int bitField0_ -> b
     byte memoizedIsInitialized -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable defaultInstance -> g
-    1:487:void <clinit>():12806:13292 -> <clinit>
-    488:489:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.initFields():12883:12884 -> <clinit>
-    488:489:void <clinit>():13293 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):12725:12725 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):12725:12725 -> <init>
-    3:186:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):12731:12914 -> <init>
-    187:187:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):12732:12732 -> <init>
-    188:369:void <init>(boolean):12734:12734 -> <init>
-    370:535:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12749:12914 -> <init>
-    536:568:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12750:12782 -> <init>
-    569:585:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12774:12790 -> <init>
-    586:601:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12788:12803 -> <init>
-    602:609:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12794:12801 -> <init>
-    1:1:java.util.List access$12000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12725:12725 -> a
-    2:2:java.util.List access$12002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,java.util.List):12725:12725 -> a
-    3:3:int access$12102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12725:12725 -> a
-    4:11:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):12904:12911 -> a
-    1:1:int access$12202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12725:12725 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$12300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12725:12725 -> b
-    3:3:boolean isInitialized():12888:12888 -> b
-    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.getTypeCount():12841:12841 -> b
-    4:4:boolean isInitialized():12892 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.getType(int):12847:12847 -> b
-    5:5:boolean isInitialized():12893 -> b
-    6:11:boolean isInitialized():12893:12898 -> b
-    1:14:int getSerializedSize():12916:12929 -> c
-    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.newBuilder():12993:12993 -> d
-    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.newBuilderForType():12994 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():12725 -> d
-    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.newBuilder():12993:12993 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996 -> e
-    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.toBuilder():12998 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():12725 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> e
-    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.toBuilder():12998 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():12725 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getDefaultInstance():12738:12738 -> g
-    1:1:int getFirstNullable():12879:12879 -> h
-    1:1:java.util.List getTypeList():12828:12828 -> i
-    1:1:boolean hasFirstNullable():12868:12868 -> j
-    1:2:void initFields():12883:12884 -> k
-    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.newBuilder():12993:12993 -> l
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> l
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.Nx:
-    1:1:void <init>():12807:12807 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12812:12812 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12807 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.Ox:
+    1:487:void <clinit>():12814:13300 -> <clinit>
+    488:489:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.initFields():12891:12892 -> <clinit>
+    488:489:void <clinit>():13301 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):12733:12733 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):12733:12733 -> <init>
+    3:186:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):12739:12922 -> <init>
+    187:187:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):12740:12740 -> <init>
+    188:369:void <init>(boolean):12742:12742 -> <init>
+    370:535:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12757:12922 -> <init>
+    536:568:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12758:12790 -> <init>
+    569:585:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12782:12798 -> <init>
+    586:601:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12796:12811 -> <init>
+    602:609:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12802:12809 -> <init>
+    1:1:java.util.List access$12000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12733:12733 -> a
+    2:2:java.util.List access$12002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,java.util.List):12733:12733 -> a
+    3:3:int access$12102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12733:12733 -> a
+    4:11:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):12912:12919 -> a
+    1:1:int access$12202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable,int):12733:12733 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$12300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12733:12733 -> b
+    3:3:boolean isInitialized():12896:12896 -> b
+    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.getTypeCount():12849:12849 -> b
+    4:4:boolean isInitialized():12900 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.getType(int):12855:12855 -> b
+    5:5:boolean isInitialized():12901 -> b
+    6:11:boolean isInitialized():12901:12906 -> b
+    1:14:int getSerializedSize():12924:12937 -> c
+    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.newBuilder():13001:13001 -> d
+    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.newBuilderForType():13002 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():12733 -> d
+    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.newBuilder():13001:13001 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13004 -> e
+    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.toBuilder():13006 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():12733 -> e
+    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):13004:13004 -> e
+    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.toBuilder():13006 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():12733 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getDefaultInstance():12746:12746 -> g
+    1:1:int getFirstNullable():12887:12887 -> h
+    1:1:java.util.List getTypeList():12836:12836 -> i
+    1:1:boolean hasFirstNullable():12876:12876 -> j
+    1:2:void initFields():12891:12892 -> k
+    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.newBuilder():13001:13001 -> l
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13004 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13006 -> 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):13004:13004 -> l
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13006 -> l
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.fy:
+    1:1:void <init>():12815:12815 -> <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):12820:12820 -> 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):12815 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.gy:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
-    1:227:void <init>():13010:13236 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):13003:13003 -> a
-    2:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13063:13067 -> a
-    7:9:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.ensureTypeIsMutable():13114:13116 -> a
-    7:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13069 -> a
-    10:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13070:13075 -> a
-    16:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.setFirstNullable(int):13268:13269 -> a
-    16:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13075 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13077:13077 -> a
-    19:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13098:13104 -> a
-    19:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13003 -> a
-    26:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13100:13104 -> a
-    26:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13003 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.build():13038:13039 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13003 -> c
+    1:227:void <init>():13018:13244 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):13011:13011 -> a
+    2:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13071:13075 -> a
+    7:9:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.ensureTypeIsMutable():13122:13124 -> a
+    7:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13077 -> a
+    10:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13078:13083 -> a
+    16:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.setFirstNullable(int):13276:13277 -> a
+    16:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13083 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13085:13085 -> a
+    19:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13106:13112 -> a
+    19:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13011 -> a
+    26:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13108:13112 -> a
+    26:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13011 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.build():13046:13047 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13011 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.build():13040 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13003 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.build():13040:13040 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13003 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.create():13017:13017 -> clone
-    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.clone():13030 -> clone
-    1:1:java.lang.Object clone():13003 -> clone
-    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$Builder.clone():13030:13030 -> clone
-    2:2:java.lang.Object clone():13003 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.create():13017:13017 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13003 -> f
-    1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.Sx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.build():13048 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13011 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.build():13048:13048 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():13011 -> c
+    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():13025:13025 -> clone
+    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.clone():13038 -> clone
+    1:1:java.lang.Object clone():13011 -> clone
+    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$Builder.clone():13038:13038 -> clone
+    2:2:java.lang.Object clone():13011 -> clone
+    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():13025:13025 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13011 -> f
+    1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13054:13066 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.ky:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -62420,78 +62765,78 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> m
     int name_ -> e
     int bitField0_ -> c
-    1:724:void <clinit>():18159:18882 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):18047:18047 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):18047:18047 -> <init>
-    3:294:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):18054:18345 -> <init>
-    295:295:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):18055:18055 -> <init>
-    296:585:void <init>(boolean):18057:18057 -> <init>
-    586:859:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18072:18345 -> <init>
-    860:925:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18073:18138 -> <init>
-    926:927:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18132:18133 -> <init>
-    928:936:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18120:18128 -> <init>
-    937:945:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18107:18115 -> <init>
-    946:947:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18101:18102 -> <init>
-    948:998:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18096:18146 -> <init>
-    999:1011:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18144:18156 -> <init>
-    1012:1018:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18150:18156 -> <init>
-    1:1:int access$16902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18047:18047 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18047:18047 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$17600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18047:18047 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.getDefaultInstanceForType():18065:18065 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():18047 -> a
-    5:28:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):18319:18342 -> a
-    1:1:int access$17002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18047:18047 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18047:18047 -> b
-    3:3:boolean isInitialized():18289:18289 -> b
-    4:4:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.hasName():18210:18210 -> b
-    4:4:boolean isInitialized():18293 -> b
-    5:8:boolean isInitialized():18294:18297 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.getType():18231:18231 -> b
-    9:9:boolean isInitialized():18298 -> b
-    10:15:boolean isInitialized():18298:18303 -> b
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.getVarargElementType():18261:18261 -> b
-    16:16:boolean isInitialized():18304 -> b
-    17:26:boolean isInitialized():18304:18313 -> b
-    1:1:int access$17202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18047:18047 -> c
-    2:32:int getSerializedSize():18347:18377 -> c
-    1:1:int access$17402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18047:18047 -> d
-    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():18441:18441 -> d
-    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.newBuilderForType():18442 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():18047 -> d
-    1:1:int access$17502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18047:18047 -> e
-    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():18441:18441 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444 -> e
-    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.toBuilder():18446 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():18047 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444:18444 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.toBuilder():18446 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():18047 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():18061:18061 -> k
-    1:1:int getFlags():18201:18201 -> l
-    1:1:int getName():18216:18216 -> m
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18231:18231 -> n
-    1:1:int getTypeId():18246:18246 -> o
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18261:18261 -> p
-    1:1:int getVarargElementTypeId():18276:18276 -> q
-    1:1:boolean hasFlags():18188:18188 -> r
-    1:1:boolean hasName():18210:18210 -> s
-    1:1:boolean hasType():18225:18225 -> t
-    1:1:boolean hasTypeId():18240:18240 -> u
-    1:1:boolean hasVarargElementType():18255:18255 -> v
-    1:1:boolean hasVarargElementTypeId():18270:18270 -> w
-    1:6:void initFields():18280:18285 -> x
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18441:18441 -> y
-    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.newBuilder():18441:18441 -> z
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444 -> z
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444:18444 -> z
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.Qx:
-    1:1:void <init>():18160:18160 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18165:18165 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18160 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.Rx:
+    1:724:void <clinit>():18183:18906 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):18071:18071 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):18071:18071 -> <init>
+    3:294:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):18078:18369 -> <init>
+    295:295:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):18079:18079 -> <init>
+    296:585:void <init>(boolean):18081:18081 -> <init>
+    586:859:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18096:18369 -> <init>
+    860:925:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18097:18162 -> <init>
+    926:927:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18156:18157 -> <init>
+    928:936:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18144:18152 -> <init>
+    937:945:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18131:18139 -> <init>
+    946:947:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18125:18126 -> <init>
+    948:998:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18120:18170 -> <init>
+    999:1011:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18168:18180 -> <init>
+    1012:1018:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18174:18180 -> <init>
+    1:1:int access$16902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18071:18071 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18071:18071 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$17600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18071:18071 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.getDefaultInstanceForType():18089:18089 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():18071 -> a
+    5:28:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):18343:18366 -> a
+    1:1:int access$17002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18071:18071 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type access$17302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18071:18071 -> b
+    3:3:boolean isInitialized():18313:18313 -> b
+    4:4:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.hasName():18234:18234 -> b
+    4:4:boolean isInitialized():18317 -> b
+    5:8:boolean isInitialized():18318:18321 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.getType():18255:18255 -> b
+    9:9:boolean isInitialized():18322 -> b
+    10:15:boolean isInitialized():18322:18327 -> b
+    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.getVarargElementType():18285:18285 -> b
+    16:16:boolean isInitialized():18328 -> b
+    17:26:boolean isInitialized():18328:18337 -> b
+    1:1:int access$17202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18071:18071 -> c
+    2:32:int getSerializedSize():18371:18401 -> c
+    1:1:int access$17402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18071:18071 -> d
+    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():18465:18465 -> d
+    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.newBuilderForType():18466 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():18071 -> d
+    1:1:int access$17502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,int):18071:18071 -> e
+    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():18465:18465 -> e
+    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):18468 -> e
+    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.toBuilder():18470 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():18071 -> e
+    3:3: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):18468:18468 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.toBuilder():18470 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():18071 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():18085:18085 -> k
+    1:1:int getFlags():18225:18225 -> l
+    1:1:int getName():18240:18240 -> m
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getType():18255:18255 -> n
+    1:1:int getTypeId():18270:18270 -> o
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type getVarargElementType():18285:18285 -> p
+    1:1:int getVarargElementTypeId():18300:18300 -> q
+    1:1:boolean hasFlags():18212:18212 -> r
+    1:1:boolean hasName():18234:18234 -> s
+    1:1:boolean hasType():18249:18249 -> t
+    1:1:boolean hasTypeId():18264:18264 -> u
+    1:1:boolean hasVarargElementType():18279:18279 -> v
+    1:1:boolean hasVarargElementTypeId():18294:18294 -> w
+    1:6:void initFields():18304:18309 -> x
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18465:18465 -> y
+    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.newBuilder():18465:18465 -> z
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18468 -> z
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18470 -> 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):18468:18468 -> z
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18470 -> z
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.iy:
+    1:1:void <init>():18184:18184 -> <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):18189:18189 -> 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):18184 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.jy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
     int varargElementTypeId_ -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> g
@@ -62499,69 +62844,69 @@
     int name_ -> f
     int bitField0_ -> d
     int flags_ -> e
-    1:329:void <init>():18457:18785 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):18451:18451 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18533:18535 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setFlags(int):18639:18640 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18535 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18537:18538 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setName(int):18678:18679 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18538 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18540:18541 -> a
-    13:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18732:18734 -> a
-    13:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18541 -> a
+    1:329:void <init>():18481:18809 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):18475:18475 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18557:18559 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setFlags(int):18663:18664 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18559 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18561:18562 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setName(int):18702:18703 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18562 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18564:18565 -> a
+    13:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18756:18758 -> a
+    13:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18565 -> a
     16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18734 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18541 -> a
+    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18758 -> a
+    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18565 -> a
     17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18734 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18541 -> a
-    18:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18734:18740 -> a
-    18:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18541 -> a
-    25:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18543:18544 -> a
-    27:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setTypeId(int):18770:18771 -> a
-    27:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18544 -> a
-    29:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18546:18547 -> a
-    31:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18824:18826 -> a
-    31:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18547 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18758 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18565 -> a
+    18:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18758:18764 -> a
+    18:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18565 -> a
+    25:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18567:18568 -> a
+    27:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setTypeId(int):18794:18795 -> a
+    27:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18568 -> a
+    29:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18570:18571 -> a
+    31:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18848:18850 -> a
+    31:33:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18571 -> a
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6183:6183 -> a
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18826 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18547 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18850 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18571 -> a
     35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):6186:6186 -> a
-    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18826 -> a
-    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18547 -> a
-    36:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18826:18832 -> a
-    36:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18547 -> a
-    43:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18549:18550 -> a
-    45:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setVarargElementTypeId(int):18862:18863 -> a
-    45:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18550 -> a
-    47:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18552:18553 -> a
-    49:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18588:18594 -> a
-    49:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18451 -> a
-    56:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18590:18594 -> a
-    56:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18451 -> a
-    61:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setFlags(int):18639:18640 -> a
-    63:65:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18713:18715 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setName(int):18678:18679 -> b
-    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18805:18807 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():18451:18451 -> c
-    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():18464:18464 -> clone
-    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.clone():18485 -> clone
-    1:1:java.lang.Object clone():18451 -> clone
-    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$Builder.clone():18485:18485 -> clone
-    2:2:java.lang.Object clone():18451 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.getDefaultInstanceForType():18489:18489 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():18451 -> d
-    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():18464:18464 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$16700():18451 -> g
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18493:18494 -> h
+    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18850 -> a
+    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18571 -> a
+    36:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18850:18856 -> a
+    36:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18571 -> a
+    43:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18573:18574 -> a
+    45:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setVarargElementTypeId(int):18886:18887 -> a
+    45:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18574 -> a
+    47:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18576:18577 -> a
+    49:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18612:18618 -> a
+    49:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18475 -> a
+    56:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18614:18618 -> a
+    56:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18475 -> a
+    61:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setFlags(int):18663:18664 -> a
+    63:65:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18737:18739 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setName(int):18702:18703 -> b
+    3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder setVarargElementType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):18829:18831 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():18475:18475 -> c
+    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():18488:18488 -> clone
+    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.clone():18509 -> clone
+    1:1:java.lang.Object clone():18475 -> clone
+    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$Builder.clone():18509:18509 -> clone
+    2:2:java.lang.Object clone():18475 -> clone
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.getDefaultInstanceForType():18513:18513 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():18475 -> d
+    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():18488:18488 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$16700():18475 -> g
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18517:18518 -> h
     3:3: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 -> h
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495 -> h
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495:18495 -> h
-    1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.Xx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18519 -> h
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18519:18519 -> h
+    1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18525:18552 -> i
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.py:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -62574,62 +62919,62 @@
     int bitField0_ -> b
     int version_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> l
-    1:885:void <clinit>():21033:21917 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20924:20924 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20924:20924 -> <init>
-    3:440:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):20930:21367 -> <init>
-    441:441:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):20931:20931 -> <init>
-    442:877:void <init>(boolean):20933:20933 -> <init>
-    878:1297:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20948:21367 -> <init>
-    1298:1360:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20949:21011 -> <init>
-    1361:1362:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20999:21000 -> <init>
-    1363:1364:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20994:20995 -> <init>
-    1365:1372:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20982:20989 -> <init>
-    1373:1374:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20977:20978 -> <init>
-    1375:1423:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20972:21020 -> <init>
-    1424:1436:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21018:21030 -> <init>
-    1437:1441:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21024:21028 -> <init>
-    1:1:int access$20002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20924:20924 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level access$20202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):20924:20924 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind access$20502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):20924:20924 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$20700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):20924:20924 -> a
-    5:24:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):21345:21364 -> a
-    1:1:int access$20102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20924:20924 -> b
-    2:6:boolean isInitialized():21335:21339 -> b
-    1:1:int access$20302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20924:20924 -> c
-    2:31:int getSerializedSize():21369:21398 -> c
-    1:1:int access$20402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20924:20924 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder():21462:21462 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilderForType():21463 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20924 -> d
-    1:1:int access$20602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20924:20924 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder():21462:21462 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21465 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.toBuilder():21467 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20924 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21465:21465 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.toBuilder():21467 -> e
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20924 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement getDefaultInstance():20937:20937 -> g
-    1:1:int getErrorCode():21274:21274 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level getLevel():21251:21251 -> i
-    1:1:int getMessage():21297:21297 -> j
-    1:1:int getVersion():21203:21203 -> k
-    1:1:int getVersionFull():21228:21228 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind getVersionKind():21322:21322 -> m
-    1:1:boolean hasErrorCode():21264:21264 -> n
-    1:1:boolean hasLevel():21241:21241 -> o
-    1:1:boolean hasMessage():21287:21287 -> p
-    1:1:boolean hasVersion():21191:21191 -> q
-    1:1:boolean hasVersionFull():21217:21217 -> r
-    1:1:boolean hasVersionKind():21311:21311 -> s
-    1:6:void initFields():21326:21331 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21462:21462 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.Tx:
-    1:1:void <init>():21034:21034 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21039:21039 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21034 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.Ux:
+    1:885:void <clinit>():21057:21941 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20948:20948 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):20948:20948 -> <init>
+    3:440:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):20954:21391 -> <init>
+    441:441:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):20955:20955 -> <init>
+    442:877:void <init>(boolean):20957:20957 -> <init>
+    878:1297:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20972:21391 -> <init>
+    1298:1360:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20973:21035 -> <init>
+    1361:1362:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21023:21024 -> <init>
+    1363:1364:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21018:21019 -> <init>
+    1365:1372:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21006:21013 -> <init>
+    1373:1374:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21001:21002 -> <init>
+    1375:1423:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20996:21044 -> <init>
+    1424:1436:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21042:21054 -> <init>
+    1437:1441:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21048:21052 -> <init>
+    1:1:int access$20002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20948:20948 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level access$20202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):20948:20948 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind access$20502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):20948:20948 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$20700(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):20948:20948 -> a
+    5:24:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):21369:21388 -> a
+    1:1:int access$20102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20948:20948 -> b
+    2:6:boolean isInitialized():21359:21363 -> b
+    1:1:int access$20302(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20948:20948 -> c
+    2:31:int getSerializedSize():21393:21422 -> c
+    1:1:int access$20402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20948:20948 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder():21486:21486 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilderForType():21487 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20948 -> d
+    1:1:int access$20602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):20948:20948 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder():21486:21486 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21489 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.toBuilder():21491 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20948 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21489:21489 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement.toBuilder():21491 -> e
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():20948 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement getDefaultInstance():20961:20961 -> g
+    1:1:int getErrorCode():21298:21298 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level getLevel():21275:21275 -> i
+    1:1:int getMessage():21321:21321 -> j
+    1:1:int getVersion():21227:21227 -> k
+    1:1:int getVersionFull():21252:21252 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind getVersionKind():21346:21346 -> m
+    1:1:boolean hasErrorCode():21288:21288 -> n
+    1:1:boolean hasLevel():21265:21265 -> o
+    1:1:boolean hasMessage():21311:21311 -> p
+    1:1:boolean hasVersion():21215:21215 -> q
+    1:1:boolean hasVersionFull():21241:21241 -> r
+    1:1:boolean hasVersionKind():21335:21335 -> s
+    1:6:void initFields():21350:21355 -> t
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21486:21486 -> u
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.ly:
+    1:1:void <init>():21058:21058 -> <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):21063:21063 -> 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):21058 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.my:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -62637,163 +62982,163 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind versionKind_ -> h
     int bitField0_ -> b
     int version_ -> c
-    1:379:void <init>():21479:21857 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):21472:21472 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21555:21557 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersion(int):21637:21638 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21557 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21559:21560 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersionFull(int):21690:21691 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21560 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21562:21563 -> a
-    13:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setLevel(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):21740:21743 -> a
-    13:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21563 -> a
-    17:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21565:21566 -> a
-    19:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setErrorCode(int):21790:21791 -> a
-    19:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21566 -> a
-    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21568:21569 -> a
-    23:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setMessage(int):21838:21839 -> a
-    23:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21569 -> a
-    25:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21571:21572 -> a
-    27:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersionKind(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):21890:21893 -> a
-    27:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21572 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21574:21574 -> a
-    32:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21589:21595 -> a
-    32:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21472 -> a
-    39:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21591:21595 -> a
-    39:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21472 -> a
-    44:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setLevel(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):21742:21743 -> a
-    46:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setErrorCode(int):21790:21791 -> a
-    48:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setVersionKind(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):21892:21893 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setMessage(int):21838:21839 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21515:21516 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():21472 -> c
+    1:379:void <init>():21503:21881 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):21496:21496 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21579:21581 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersion(int):21661:21662 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21581 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21583:21584 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersionFull(int):21714:21715 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21584 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21586:21587 -> a
+    13:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setLevel(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):21764:21767 -> a
+    13:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21587 -> a
+    17:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21589:21590 -> a
+    19:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setErrorCode(int):21814:21815 -> a
+    19:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21590 -> a
+    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21592:21593 -> a
+    23:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setMessage(int):21862:21863 -> a
+    23:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21593 -> a
+    25:26:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21595:21596 -> a
+    27:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersionKind(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):21914:21917 -> a
+    27:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21596 -> a
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement):21598:21598 -> a
+    32:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21613:21619 -> a
+    32:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21496 -> a
+    39:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21615:21619 -> a
+    39:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21496 -> a
+    44:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setLevel(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):21766:21767 -> a
+    46:47:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setErrorCode(int):21814:21815 -> a
+    48:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setVersionKind(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):21916:21917 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setMessage(int):21862:21863 -> b
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21539:21540 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():21496 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21517 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():21472 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21517:21517 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():21472 -> c
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setVersion(int):21637:21638 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():21486:21486 -> clone
-    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.clone():21507 -> clone
-    1:1:java.lang.Object clone():21472 -> clone
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.clone():21507:21507 -> clone
-    2:2:java.lang.Object clone():21472 -> clone
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setVersionFull(int):21690:21691 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():21486:21486 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21472 -> f
-    1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.Vx:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21541 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():21496 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21541:21541 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():21496 -> c
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setVersion(int):21661:21662 -> c
+    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():21510:21510 -> clone
+    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.clone():21531 -> clone
+    1:1:java.lang.Object clone():21496 -> clone
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.clone():21531:21531 -> clone
+    2:2:java.lang.Object clone():21496 -> clone
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder setVersionFull(int):21714:21715 -> d
+    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():21510:21510 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21496 -> f
+    1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21547:21574 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.ny:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> b
     int value -> a
-    1:9:void <clinit>():21056:21064 -> <clinit>
-    10:10:void <clinit>():21051:21051 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int,int):21106:21107 -> <init>
-    1:1:int getNumber():21081:21081 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21087:21087 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21086:21086 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21085:21085 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.Wx:
+    1:9:void <clinit>():21080:21088 -> <clinit>
+    10:10:void <clinit>():21075:21075 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int,int):21130:21131 -> <init>
+    1:1:int getNumber():21105:21105 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21111:21111 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21110:21110 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21109:21109 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.oy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind[] $VALUES -> e
     int value -> a
-    1:9:void <clinit>():21121:21129 -> <clinit>
-    10:10:void <clinit>():21116:21116 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int,int):21171:21172 -> <init>
-    1:1:int getNumber():21146:21146 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21152:21152 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21151:21151 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21150:21150 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.ay:
+    1:9:void <clinit>():21145:21153 -> <clinit>
+    10:10:void <clinit>():21140:21140 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int,int):21195:21196 -> <init>
+    1:1:int getNumber():21170:21170 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21176:21176 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21175:21175 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21174:21174 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.sy:
     java.util.List requirement_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> f
     int memoizedSerializedSize -> d
     byte memoizedIsInitialized -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable defaultInstance -> e
-    1:378:void <clinit>():22020:22397 -> <clinit>
-    379:379:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.initFields():22071:22071 -> <clinit>
-    379:379:void <clinit>():22398 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):21944:21944 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):21944:21944 -> <init>
-    3:145:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):21950:22092 -> <init>
-    146:146:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):21951:21951 -> <init>
-    147:287:void <init>(boolean):21953:21953 -> <init>
-    288:412:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21968:22092 -> <init>
-    413:448:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21969:22004 -> <init>
-    449:464:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22002:22017 -> <init>
-    465:472:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22008:22015 -> <init>
-    1:1:java.util.List access$21100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21944:21944 -> a
-    2:2:java.util.List access$21102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable,java.util.List):21944:21944 -> a
-    3:7:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):22085:22089 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$21200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21944:21944 -> b
-    2:6:boolean isInitialized():22075:22079 -> b
-    1:10:int getSerializedSize():22094:22103 -> c
-    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.newBuilder():22167:22167 -> d
-    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.newBuilderForType():22168 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():21944 -> d
-    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.newBuilder():22167:22167 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170 -> e
-    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.toBuilder():22172 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():21944 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> e
-    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.toBuilder():22172 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():21944 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getDefaultInstance():21957:21957 -> g
-    1:1:int getRequirementCount():22054:22054 -> h
-    1:1:java.util.List getRequirementList():22041:22041 -> i
-    1:1:void initFields():22071:22071 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():22167:22167 -> k
-    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.newBuilder():22167:22167 -> l
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> l
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.Yx:
-    1:1:void <init>():22021:22021 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22026:22026 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22021 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.Zx:
+    1:378:void <clinit>():22044:22421 -> <clinit>
+    379:379:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.initFields():22095:22095 -> <clinit>
+    379:379:void <clinit>():22422 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):21968:21968 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1):21968:21968 -> <init>
+    3:145:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):21974:22116 -> <init>
+    146:146:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):21975:21975 -> <init>
+    147:287:void <init>(boolean):21977:21977 -> <init>
+    288:412:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21992:22116 -> <init>
+    413:448:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21993:22028 -> <init>
+    449:464:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22026:22041 -> <init>
+    465:472:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22032:22039 -> <init>
+    1:1:java.util.List access$21100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21968:21968 -> a
+    2:2:java.util.List access$21102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable,java.util.List):21968:21968 -> a
+    3:7:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):22109:22113 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$21200(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):21968:21968 -> b
+    2:6:boolean isInitialized():22099:22103 -> b
+    1:10:int getSerializedSize():22118:22127 -> c
+    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.newBuilder():22191:22191 -> d
+    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.newBuilderForType():22192 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():21968 -> d
+    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.newBuilder():22191:22191 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22194 -> e
+    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.toBuilder():22196 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():21968 -> e
+    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):22194:22194 -> e
+    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.toBuilder():22196 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():21968 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getDefaultInstance():21981:21981 -> g
+    1:1:int getRequirementCount():22078:22078 -> h
+    1:1:java.util.List getRequirementList():22065:22065 -> i
+    1:1:void initFields():22095:22095 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():22191:22191 -> k
+    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.newBuilder():22191:22191 -> l
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22194 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22196 -> 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):22194:22194 -> l
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22196 -> l
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.qy:
+    1:1:void <init>():22045:22045 -> <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):22050:22050 -> 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):22045 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.ry:
     java.util.List requirement_ -> c
     int bitField0_ -> b
-    1:85:void <init>():22184:22268 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):22177:22177 -> a
-    2:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22229:22240 -> a
-    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22255:22261 -> a
-    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22177 -> a
-    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22257:22261 -> a
-    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22177 -> a
-    26:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22348:22349 -> a
-    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21515:21516 -> a
-    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22349 -> a
-    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22349:22349 -> a
+    1:85:void <init>():22208:22292 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):22201:22201 -> a
+    2:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22253:22264 -> a
+    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22279:22285 -> a
+    14:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22201 -> a
+    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22281:22285 -> a
+    21:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22201 -> a
+    26:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22372:22373 -> a
+    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21539:21540 -> a
+    28:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22373 -> a
+    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22373:22373 -> a
     31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21517 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22349 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21517:21517 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22349 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.build():22210:22211 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():22177 -> c
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21541 -> a
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22373 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.build():21541:21541 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder addRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder):22373 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.build():22234:22235 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():22201 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.build():22212 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():22177 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.build():22212:22212 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():22177 -> c
-    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():22191:22191 -> clone
-    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.clone():22202 -> clone
-    1:1:java.lang.Object clone():22177 -> clone
-    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$Builder.clone():22202:22202 -> clone
-    2:2:java.lang.Object clone():22177 -> clone
-    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():22191:22191 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
-    1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22218:22224 -> g
-    1:3:void ensureRequirementIsMutable():22271:22273 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.by:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.build():22236 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():22201 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.build():22236:22236 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():22201 -> c
+    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():22215:22215 -> clone
+    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.clone():22226 -> clone
+    1:1:java.lang.Object clone():22201 -> clone
+    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$Builder.clone():22226:22226 -> clone
+    2:2:java.lang.Object clone():22201 -> clone
+    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():22215:22215 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22201 -> f
+    1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22242:22248 -> g
+    1:3:void ensureRequirementIsMutable():22295:22297 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.ty:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PUBLIC -> e
@@ -62825,7 +63170,7 @@
     1:1:java.lang.String toString():52 -> toString
     2:6:java.lang.String toString():80:84 -> toString
     7:7:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.ad:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.bd:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField SUSPEND_TYPE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_ANNOTATIONS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INLINE -> e
@@ -62839,94 +63184,94 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_ACCESSOR -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_UNSIGNED -> l
     1:6:void <clinit>():17:22 -> <clinit>
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):226:227 -> <clinit>
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):235:236 -> <clinit>
     7:8:void <clinit>():22 -> <clinit>
     9:10:void <clinit>():22:23 -> <clinit>
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):226:227 -> <clinit>
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):235:236 -> <clinit>
     11:12:void <clinit>():23 -> <clinit>
     13:17:void <clinit>():23:27 -> <clinit>
-    18:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):226:227 -> <clinit>
+    18:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):235:236 -> <clinit>
     18:19:void <clinit>():27 -> <clinit>
-    20:20:void <clinit>():40:40 -> <clinit>
-    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):226:227 -> <clinit>
-    21:22:void <clinit>():40 -> <clinit>
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:239 -> <clinit>
-    23:23:void <clinit>():44 -> <clinit>
-    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    24:24:void <clinit>():46 -> <clinit>
-    25:25:void <clinit>():46:46 -> <clinit>
-    26:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:240 -> <clinit>
-    26:27:void <clinit>():66 -> <clinit>
-    28:28:void <clinit>():66:66 -> <clinit>
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    29:29:void <clinit>():67 -> <clinit>
-    30:30:void <clinit>():67:67 -> <clinit>
-    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    31:31:void <clinit>():68 -> <clinit>
-    32:32:void <clinit>():68:68 -> <clinit>
-    33:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:240 -> <clinit>
-    33:34:void <clinit>():72 -> <clinit>
-    35:35:void <clinit>():72:72 -> <clinit>
-    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    36:36:void <clinit>():73 -> <clinit>
-    37:37:void <clinit>():73:73 -> <clinit>
-    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):240:240 -> <clinit>
-    38:38:void <clinit>():74 -> <clinit>
-    39:46:void <clinit>():74:81 -> <clinit>
+    20:20:void <clinit>():42:42 -> <clinit>
+    21:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):235:236 -> <clinit>
+    21:22:void <clinit>():42 -> <clinit>
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):248:248 -> <clinit>
+    23:23:void <clinit>():46 -> <clinit>
+    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):249:249 -> <clinit>
+    24:24:void <clinit>():48 -> <clinit>
+    25:25:void <clinit>():48:48 -> <clinit>
+    26:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):248:249 -> <clinit>
+    26:27:void <clinit>():69 -> <clinit>
+    28:28:void <clinit>():69:69 -> <clinit>
+    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):249:249 -> <clinit>
+    29:29:void <clinit>():70 -> <clinit>
+    30:30:void <clinit>():70:70 -> <clinit>
+    31:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):249:249 -> <clinit>
+    31:31:void <clinit>():71 -> <clinit>
+    32:32:void <clinit>():71:71 -> <clinit>
+    33:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):248:249 -> <clinit>
+    33:34:void <clinit>():75 -> <clinit>
+    35:35:void <clinit>():75:75 -> <clinit>
+    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):249:249 -> <clinit>
+    36:36:void <clinit>():76 -> <clinit>
+    37:37:void <clinit>():76:76 -> <clinit>
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):249:249 -> <clinit>
+    38:38:void <clinit>():77 -> <clinit>
+    39:46:void <clinit>():77:84 -> <clinit>
     void $$$reportNull$$$0(int) -> a
-    1:1:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189:189 -> a
-    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite):309:309 -> a
-    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):276 -> a
-    2:2:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189 -> a
-    3:3:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189:189 -> a
-    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite):309:309 -> a
-    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):276 -> a
-    4:4:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189 -> a
-    5:5:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189:189 -> a
+    1:1:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):198:198 -> a
+    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite):318:318 -> a
+    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):285 -> a
+    2:2:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):198 -> a
+    3:3: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):198:198 -> a
+    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite):318:318 -> a
+    4:4:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):285 -> a
+    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):198 -> 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):198:198 -> a
     6:6:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.Wc:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Xc:
-    1:1:void <init>(int):259:259 -> <init>
-    1:1:java.lang.Object get(int):256:256 -> a
-    2:2:int toFlags(java.lang.Boolean):270:270 -> a
-    1:1:java.lang.Boolean get(int):265:265 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.Xc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Yc:
+    1:1:void <init>(int):268:268 -> <init>
+    1:1:java.lang.Object get(int):265:265 -> a
+    2:2:int toFlags(java.lang.Boolean):279:279 -> a
+    1:1:java.lang.Boolean get(int):274:274 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.$$$reportNull$$$0(int):0:0 -> b
-    2:2:java.lang.Boolean get(int):265 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.Yc:
+    2:2:java.lang.Boolean get(int):274 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.Zc:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[] values -> c
-    1:2:void <init>(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):280:281 -> <init>
-    1:6:int bitWidth(java.lang.Object[]):285:290 -> a
+    1:2:void <init>(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):289:290 -> <init>
+    1:6:int bitWidth(java.lang.Object[]):294:299 -> a
     7:7:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.$$$reportNull$$$0(int):0:0 -> a
     7:7:int bitWidth(java.lang.Object[]):0 -> a
-    8:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):296:300 -> a
-    8:12:java.lang.Object get(int):276 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Zc:
+    8:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):305:309 -> a
+    8:12:java.lang.Object get(int):285 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.ad:
     int bitWidth -> b
     int offset -> a
-    1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):224:224 -> <init>
-    2:4:void <init>(int,int):246:248 -> <init>
+    1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):233:233 -> <init>
+    2:4:void <init>(int,int):255:257 -> <init>
     java.lang.Object get(int) -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():235:235 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.ks:
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():244:244 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.Ds:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.cy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.uy:
 # {"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.vy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.Ny:
 # {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):50:51 -> a
     3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:58 -> a
     6:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:72 -> a
     1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):42:44 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.CF:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.cG:
 # {"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>
-    21:33:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):28:40 -> <init>
-    34:34:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):31:31 -> <init>
-    35:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
+    21:21:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):28:28 -> <init>
+    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.BG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.XG:
 # {"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
@@ -62940,7 +63285,7 @@
     1:1:java.lang.String getMessage():29:29 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version getVersion():25:25 -> e
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.AG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.WG:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     int minor -> b
     int patch -> c
@@ -62955,7 +63300,7 @@
     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.DG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.ZG:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> c
@@ -62966,17 +63311,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable access$getEMPTY$cp():11:11 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
     3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):0:0 -> a
-    3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getOrNull(java.util.List,int):0 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
-    4:165:int com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getLastIndex(java.util.List):0:161 -> a
-    4:165:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):254 -> a
-    4:165:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getOrNull(java.util.List,int):0 -> a
-    4:165:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
-    166:166:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):254:254 -> a
-    166:166:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getOrNull(java.util.List,int):0 -> a
-    166:166:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
-    167:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.CG:
+    4:225:int com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getLastIndex(java.util.List):0:221 -> a
+    4:225:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):274 -> a
+    4:225:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
+    226:226:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):274:274 -> a
+    226:226:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
+    227:227:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.YG:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
@@ -62984,7 +63326,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.getEMPTY():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
     3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.Pk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.ll:
     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
@@ -62994,13 +63336,14 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension classModuleName -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension typeAnnotation -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension isRaw -> g
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageModuleName -> l
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageLocalVariable -> m
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension jvmClassFlags -> l
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageModuleName -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension classLocalVariable -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
-    1:212:void <clinit>():3800:4011 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.yk:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.Bk:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageLocalVariable -> n
+    1:233:void <clinit>():3801:4033 -> <clinit>
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.Uk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.Xk:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> g
@@ -63009,87 +63352,87 @@
     int bitField0_ -> b
     int name_ -> c
     byte memoizedIsInitialized -> e
-    1:348:void <clinit>():2669:3016 -> <clinit>
-    349:350:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.initFields():2724:2725 -> <clinit>
-    349:350:void <clinit>():3017 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2594:2594 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2594:2594 -> <init>
-    3:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2600:2749 -> <init>
-    153:153:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2601:2601 -> <init>
-    154:301:void <init>(boolean):2603:2603 -> <init>
-    302:433:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2618:2749 -> <init>
-    434:463:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2619:2648 -> <init>
-    464:478:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2642:2656 -> <init>
-    479:491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2654:2666 -> <init>
-    492:496:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2660:2664 -> <init>
-    1:1:int access$2702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2594:2594 -> a
-    3:10:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):2739:2746 -> a
-    1:1:int access$2802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> b
-    2:6:boolean isInitialized():2729:2733 -> b
-    1:1:int access$2902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2594:2594 -> c
-    2:15:int getSerializedSize():2751:2764 -> c
-    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.newBuilder():2828:2828 -> d
-    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.newBuilderForType():2829 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2594 -> d
-    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.newBuilder():2828:2828 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831 -> e
-    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.toBuilder():2833 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2594 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> e
-    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.toBuilder():2833 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2594 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> g
-    1:1:int getDesc():2720:2720 -> h
-    1:1:int getName():2697:2697 -> i
-    1:1:boolean hasDesc():2710:2710 -> j
-    1:1:boolean hasName():2691:2691 -> k
-    1:2:void initFields():2724:2725 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> m
-    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.newBuilder():2828:2828 -> n
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> n
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.zk:
-    1:1:void <init>():2670:2670 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2675:2675 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2670 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.Ak:
+    1:348:void <clinit>():2670:3017 -> <clinit>
+    349:350:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.initFields():2725:2726 -> <clinit>
+    349:350:void <clinit>():3018 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2595:2595 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2595:2595 -> <init>
+    3:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2601:2750 -> <init>
+    153:153:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2602:2602 -> <init>
+    154:301:void <init>(boolean):2604:2604 -> <init>
+    302:433:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2619:2750 -> <init>
+    434:463:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2620:2649 -> <init>
+    464:478:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2643:2657 -> <init>
+    479:491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2655:2667 -> <init>
+    492:496:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2661:2665 -> <init>
+    1:1:int access$2702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2595:2595 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3000(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2595:2595 -> a
+    3:10:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):2740:2747 -> a
+    1:1:int access$2802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2595:2595 -> b
+    2:6:boolean isInitialized():2730:2734 -> b
+    1:1:int access$2902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2595:2595 -> c
+    2:15:int getSerializedSize():2752:2765 -> c
+    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.newBuilder():2829:2829 -> d
+    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.newBuilderForType():2830 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2595 -> d
+    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.newBuilder():2829:2829 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2832 -> e
+    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.toBuilder():2834 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2595 -> e
+    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 -> e
+    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.toBuilder():2834 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2595 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2608:2608 -> g
+    1:1:int getDesc():2721:2721 -> h
+    1:1:int getName():2698:2698 -> i
+    1:1:boolean hasDesc():2711:2711 -> j
+    1:1:boolean hasName():2692:2692 -> k
+    1:2:void initFields():2725:2726 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2829:2829 -> m
+    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.newBuilder():2829:2829 -> n
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2832 -> n
+    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.Vk:
+    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.Wk:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
-    1:1:void <init>():2845:2845 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):2838:2838 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2897:2899 -> a
-    5:6: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.setName(int):2949:2950 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2899 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2901:2902 -> a
-    9:10: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.setDesc(int):2993:2994 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2902 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2904:2904 -> a
-    12:18: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2919:2925 -> a
-    12:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2838 -> a
-    19:23: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2921:2925 -> a
-    19:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2838 -> a
-    24:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder setDesc(int):2993:2994 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder setName(int):2949:2950 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2873:2874 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2838 -> c
+    1:1:void <init>():2846:2846 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):2839:2839 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2898:2900 -> a
+    5:6: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.setName(int):2950:2951 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2900 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2902:2903 -> a
+    9:10: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.setDesc(int):2994:2995 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2903 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2905:2905 -> a
+    12:18: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2920:2926 -> a
+    12:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2839 -> a
+    19:23: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2922:2926 -> a
+    19:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2839 -> a
+    24:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder setDesc(int):2994:2995 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder setName(int):2950:2951 -> b
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2874:2875 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2839 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2875 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2838 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2875:2875 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2838 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2852:2852 -> clone
-    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.clone():2865 -> clone
-    1:1:java.lang.Object clone():2838 -> clone
-    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$Builder.clone():2865:2865 -> clone
-    2:2:java.lang.Object clone():2838 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2852:2852 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2838 -> f
-    1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.Ek:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2839 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876:2876 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2839 -> c
+    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 -> clone
+    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.clone():2866 -> clone
+    1:1:java.lang.Object clone():2839 -> clone
+    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$Builder.clone():2866:2866 -> clone
+    2:2:java.lang.Object clone():2839 -> clone
+    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.al:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -63098,87 +63441,87 @@
     int bitField0_ -> b
     int name_ -> c
     byte memoizedIsInitialized -> e
-    1:348:void <clinit>():2207:2554 -> <clinit>
-    349:350:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.initFields():2262:2263 -> <clinit>
-    349:350:void <clinit>():2555 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2132:2132 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2132:2132 -> <init>
-    3:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2138:2287 -> <init>
-    153:153:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2139:2139 -> <init>
-    154:301:void <init>(boolean):2141:2141 -> <init>
-    302:433:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2156:2287 -> <init>
-    434:463:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2157:2186 -> <init>
-    464:478:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2180:2194 -> <init>
-    479:491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2192:2204 -> <init>
-    492:496:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2198:2202 -> <init>
-    1:1:int access$2002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$2300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2132:2132 -> a
-    3:10:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):2277:2284 -> a
-    1:1:int access$2102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> b
-    2:6:boolean isInitialized():2267:2271 -> b
-    1:1:int access$2202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2132:2132 -> c
-    2:15:int getSerializedSize():2289:2302 -> c
-    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.newBuilder():2366:2366 -> d
-    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.newBuilderForType():2367 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2132 -> d
-    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.newBuilder():2366:2366 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> e
-    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.toBuilder():2371 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2132 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> e
-    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.toBuilder():2371 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2132 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> g
-    1:1:int getDesc():2258:2258 -> h
-    1:1:int getName():2235:2235 -> i
-    1:1:boolean hasDesc():2248:2248 -> j
-    1:1:boolean hasName():2229:2229 -> k
-    1:2:void initFields():2262:2263 -> l
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> m
-    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.newBuilder():2366:2366 -> n
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> n
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> n
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.Ck:
-    1:1:void <init>():2208:2208 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2213:2213 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2208 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.Dk:
+    1:348:void <clinit>():2208:2555 -> <clinit>
+    349:350:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.initFields():2263:2264 -> <clinit>
+    349:350:void <clinit>():2556 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2133:2133 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):2133:2133 -> <init>
+    3:152:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2139:2288 -> <init>
+    153:153:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):2140:2140 -> <init>
+    154:301:void <init>(boolean):2142:2142 -> <init>
+    302:433:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2157:2288 -> <init>
+    434:463:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2158:2187 -> <init>
+    464:478:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2181:2195 -> <init>
+    479:491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2193:2205 -> <init>
+    492:496:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2199:2203 -> <init>
+    1:1:int access$2002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2133:2133 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$2300(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2133:2133 -> a
+    3:10:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):2278:2285 -> a
+    1:1:int access$2102(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2133:2133 -> b
+    2:6:boolean isInitialized():2268:2272 -> b
+    1:1:int access$2202(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2133:2133 -> c
+    2:15:int getSerializedSize():2290:2303 -> c
+    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.newBuilder():2367:2367 -> d
+    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.newBuilderForType():2368 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2133 -> d
+    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.newBuilder():2367:2367 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2370 -> e
+    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.toBuilder():2372 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2133 -> e
+    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 -> e
+    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.toBuilder():2372 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():2133 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2146:2146 -> g
+    1:1:int getDesc():2259:2259 -> h
+    1:1:int getName():2236:2236 -> i
+    1:1:boolean hasDesc():2249:2249 -> j
+    1:1:boolean hasName():2230:2230 -> k
+    1:2:void initFields():2263:2264 -> l
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2367:2367 -> m
+    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.newBuilder():2367:2367 -> n
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2370 -> n
+    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.Yk:
+    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.Zk:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
-    1:1:void <init>():2383:2383 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):2376:2376 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2435:2437 -> a
-    5:6: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.setName(int):2487:2488 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2437 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2439:2440 -> a
-    9:10: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.setDesc(int):2531:2532 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2440 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2442:2442 -> a
-    12:18: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2457:2463 -> a
-    12:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2376 -> a
-    19:23: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2459:2463 -> a
-    19:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2376 -> a
-    24:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder setDesc(int):2531:2532 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder setName(int):2487:2488 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2411:2412 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2376 -> c
+    1:1:void <init>():2384:2384 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):2377:2377 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2436:2438 -> a
+    5:6: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.setName(int):2488:2489 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2438 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2440:2441 -> a
+    9:10: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.setDesc(int):2532:2533 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2441 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2443:2443 -> a
+    12:18: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2458:2464 -> a
+    12:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2377 -> a
+    19:23: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2460:2464 -> a
+    19:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2377 -> a
+    24:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder setDesc(int):2532:2533 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder setName(int):2488:2489 -> b
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2412:2413 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2377 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2376 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413:2413 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2376 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2390:2390 -> clone
-    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.clone():2403 -> clone
-    1:1:java.lang.Object clone():2376 -> clone
-    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$Builder.clone():2403:2403 -> clone
-    2:2:java.lang.Object clone():2376 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2390:2390 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2376 -> f
-    1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.Hk:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2377 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414:2414 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():2377 -> c
+    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 -> clone
+    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.clone():2404 -> clone
+    1:1:java.lang.Object clone():2377 -> clone
+    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$Builder.clone():2404:2404 -> clone
+    2:2:java.lang.Object clone():2377 -> clone
+    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.dl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -63189,136 +63532,136 @@
     int bitField0_ -> b
     byte memoizedIsInitialized -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> j
-    1:596:void <clinit>():3191:3786 -> <clinit>
-    597:600:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.initFields():3276:3279 -> <clinit>
-    597:600:void <clinit>():3787 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):3074:3074 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):3074:3074 -> <init>
-    3:232:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):3080:3309 -> <init>
-    233:233:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):3081:3081 -> <init>
-    234:461:void <init>(boolean):3083:3083 -> <init>
-    462:673:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3098:3309 -> <init>
-    674:745:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3099:3170 -> <init>
-    746:754:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3149:3157 -> <init>
-    755:763:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3136:3144 -> <init>
-    764:819:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3123:3178 -> <init>
-    820:832:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3176:3188 -> <init>
-    833:837:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3182:3186 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature access$3402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3074:3074 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> a
-    3:3:int access$3802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,int):3074:3074 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3074:3074 -> a
-    5:18:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):3293:3306 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> b
-    2:6:boolean isInitialized():3283:3287 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3074:3074 -> c
-    2:23:int getSerializedSize():3311:3332 -> c
-    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.newBuilder():3396:3396 -> d
-    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.newBuilderForType():3397 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():3074 -> d
-    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.newBuilder():3396:3396 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3399 -> e
-    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.toBuilder():3401 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():3074 -> e
-    2:2: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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3399:3399 -> e
-    2:2: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.toBuilder():3401 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():3074 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature getDefaultInstance():3087:3087 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getField():3219:3219 -> h
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getGetter():3257:3257 -> i
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getSetter():3272:3272 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getSyntheticMethod():3242:3242 -> k
-    1:1:boolean hasField():3213:3213 -> l
-    1:1:boolean hasGetter():3251:3251 -> m
-    1:1:boolean hasSetter():3266:3266 -> n
-    1:1:boolean hasSyntheticMethod():3232:3232 -> o
-    1:4:void initFields():3276:3279 -> p
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3396:3396 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.Fk:
-    1:1:void <init>():3192:3192 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3197:3197 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3192 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.Gk:
+    1:596:void <clinit>():3192:3787 -> <clinit>
+    597:600:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.initFields():3277:3280 -> <clinit>
+    597:600:void <clinit>():3788 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):3075:3075 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):3075:3075 -> <init>
+    3:232:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):3081:3310 -> <init>
+    233:233:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):3082:3082 -> <init>
+    234:461:void <init>(boolean):3084:3084 -> <init>
+    462:673:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3099:3310 -> <init>
+    674:745:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3100:3171 -> <init>
+    746:754:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3150:3158 -> <init>
+    755:763:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3137:3145 -> <init>
+    764:819:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3124:3179 -> <init>
+    820:832:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3177:3189 -> <init>
+    833:837:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3183:3187 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature access$3402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3075:3075 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3075:3075 -> a
+    3:3:int access$3802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,int):3075:3075 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$3900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3075:3075 -> a
+    5:18:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):3294:3307 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3075:3075 -> b
+    2:6:boolean isInitialized():3284:3288 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$3702(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3075:3075 -> c
+    2:23:int getSerializedSize():3312:3333 -> c
+    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.newBuilder():3397:3397 -> d
+    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.newBuilderForType():3398 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():3075 -> d
+    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.newBuilder():3397:3397 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3400 -> e
+    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.toBuilder():3402 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():3075 -> e
+    2:2: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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3400:3400 -> e
+    2:2: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.toBuilder():3402 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():3075 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature getDefaultInstance():3088:3088 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getField():3220:3220 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getGetter():3258:3258 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getSetter():3273:3273 -> j
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getSyntheticMethod():3243:3243 -> k
+    1:1:boolean hasField():3214:3214 -> l
+    1:1:boolean hasGetter():3252:3252 -> m
+    1:1:boolean hasSetter():3267:3267 -> n
+    1:1:boolean hasSyntheticMethod():3233:3233 -> o
+    1:4:void initFields():3277:3280 -> p
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3397:3397 -> q
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.bl:
+    1:1:void <init>():3193:3193 -> <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):3198:3198 -> 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):3193 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.cl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature field_ -> c
     int bitField0_ -> b
-    1:310:void <init>():3413:3722 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):3406:3406 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3477:3479 -> a
-    5:7: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3557:3559 -> a
-    5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3479 -> a
-    8:8: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():2828:2828 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831 -> a
-    8:8: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3559 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3479 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> a
-    9:9: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3559 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3479 -> a
-    10:16: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3559:3565 -> a
-    10:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3479 -> a
-    17:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3481:3482 -> a
-    19:21: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3637:3639 -> a
-    19:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3482 -> a
-    22:22: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():2366:2366 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> a
-    22:22: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3639 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3482 -> a
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> a
-    23:23: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3639 -> a
-    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3482 -> a
-    24:30: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3639:3645 -> a
-    24:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3482 -> a
-    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3484:3485 -> a
-    33:35: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3701:3703 -> a
-    33:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3485 -> a
-    36:36: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():2366:2366 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> a
-    36:36: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3703 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3485 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> a
-    37:37: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3703 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3485 -> a
-    38:44: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3703:3709 -> a
-    38:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3485 -> a
-    45:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3487:3488 -> a
-    47:49: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3761:3763 -> a
-    47:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3488 -> a
-    50:50: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():2366:2366 -> a
-    50:50:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369 -> a
-    50:50: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3763 -> a
-    50:50:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3488 -> a
-    51:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> a
-    51:51: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3763 -> a
-    51:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3488 -> a
-    52:58: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3763:3769 -> a
-    52:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3488 -> a
-    59:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3490:3490 -> a
-    60:66: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3505:3511 -> a
-    60:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3406 -> a
-    67:71: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3507:3511 -> a
-    67:71:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3406 -> a
-    72:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3538:3540 -> a
-    75:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3682:3684 -> a
-    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3742:3744 -> b
-    1:2: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():3445:3446 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():3406 -> c
+    1:310:void <init>():3414:3723 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):3407:3407 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3478:3480 -> a
+    5:7: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3558:3560 -> a
+    5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3480 -> a
+    8:8: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():2829:2829 -> a
+    8:8: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 -> a
+    8:8: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3560 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3480 -> a
+    9:9: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 -> a
+    9:9: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3560 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3480 -> a
+    10:16: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.mergeField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3560:3566 -> a
+    10:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3480 -> a
+    17:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3482:3483 -> a
+    19:21: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3638:3640 -> a
+    19:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3483 -> a
+    22:22: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():2367:2367 -> a
+    22:22: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 -> a
+    22:22: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3640 -> a
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3483 -> a
+    23:23: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 -> a
+    23:23: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3640 -> a
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3483 -> a
+    24:30: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.mergeSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3640:3646 -> a
+    24:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3483 -> a
+    31:32:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3485:3486 -> a
+    33:35: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3702:3704 -> a
+    33:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3486 -> a
+    36:36: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():2367:2367 -> a
+    36:36: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 -> a
+    36:36: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3704 -> a
+    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3486 -> a
+    37:37: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 -> a
+    37:37: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3704 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3486 -> a
+    38:44: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.mergeGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3704:3710 -> a
+    38:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3486 -> a
+    45:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3488:3489 -> a
+    47:49: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3762:3764 -> a
+    47:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3489 -> a
+    50:50: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():2367:2367 -> a
+    50:50: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 -> a
+    50:50: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3764 -> a
+    50:50:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3489 -> a
+    51:51: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 -> a
+    51:51: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3764 -> a
+    51:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3489 -> a
+    52:58: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.mergeSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3764:3770 -> a
+    52:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3489 -> a
+    59:59:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3491:3491 -> a
+    60:66: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3506:3512 -> a
+    60:66:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3407 -> a
+    67:71: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3508:3512 -> a
+    67:71:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3407 -> a
+    72:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3539:3541 -> a
+    75:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setGetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3683:3685 -> a
+    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setSetter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3743:3745 -> b
+    1:2: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():3446:3447 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():3407 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():3406 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447:3447 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():3406 -> c
-    5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3610:3612 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3420:3420 -> clone
-    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.clone():3437 -> clone
-    1:1:java.lang.Object clone():3406 -> clone
-    2:2: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.clone():3437:3437 -> clone
-    2:2:java.lang.Object clone():3406 -> clone
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3420:3420 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3406 -> f
-    1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.Ok:
+    3:3: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():3448 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():3407 -> c
+    4:4: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():3448:3448 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():3407 -> c
+    5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder setSyntheticMethod(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3611:3613 -> c
+    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():3421:3421 -> clone
+    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.clone():3438 -> clone
+    1:1:java.lang.Object clone():3407 -> clone
+    2:2: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.clone():3438:3438 -> clone
+    2:2:java.lang.Object clone():3407 -> clone
+    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():3421:3421 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3407 -> f
+    1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3454:3473 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.kl:
     java.util.List record_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -63327,84 +63670,84 @@
     int memoizedSerializedSize -> f
     int localNameMemoizedSerializedSize -> d
     byte memoizedIsInitialized -> e
-    1:1923:void <clinit>():170:2092 -> <clinit>
-    1924:1925:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.initFields():1633:1634 -> <clinit>
-    1924:1925:void <clinit>():2093 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):70:70 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):70:70 -> <init>
-    3:1589:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):76:1662 -> <init>
-    1590:1590:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):77:77 -> <init>
-    1591:3175:void <init>(boolean):79:79 -> <init>
-    3176:4744:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):94:1662 -> <init>
-    4745:4793:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):95:143 -> <init>
-    4794:4797:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):127:130 -> <init>
-    4798:4830:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):119:151 -> <init>
-    4831:4849:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):149:167 -> <init>
-    4850:4860:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):155:165 -> <init>
-    1:1:java.util.List access$1400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> a
-    2:2:java.util.List access$1402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):70:70 -> a
-    3:5:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):1648:1650 -> a
-    6:6:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.getLocalNameList():1608:1608 -> a
-    6:6:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):1652 -> a
-    7:14:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):1652:1659 -> a
-    1:1:java.util.List access$1500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> b
-    2:2:java.util.List access$1502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):70:70 -> b
-    3:7:boolean isInitialized():1638:1642 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$1600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):70:70 -> c
-    2:13:int getSerializedSize():1664:1675 -> c
-    14:14:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.getLocalNameList():1608:1608 -> c
-    14:14:int getSerializedSize():1679 -> c
-    15:23:int getSerializedSize():1679:1687 -> c
-    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.newBuilder():1751:1751 -> d
-    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.newBuilderForType():1752 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():70 -> d
-    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.newBuilder():1751:1751 -> e
-    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1754 -> e
-    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.toBuilder():1756 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():70 -> e
-    2:2: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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1754:1754 -> e
-    2:2: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.toBuilder():1756 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():70 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getDefaultInstance():83:83 -> g
-    1:1:java.util.List getLocalNameList():1608:1608 -> h
-    1:1:java.util.List getRecordList():1568:1568 -> i
-    1:2:void initFields():1633:1634 -> j
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1751:1751 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.Ik:
-    1:1:void <init>():171:171 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):176:176 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):171 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.Jk:
+    1:1923:void <clinit>():171:2093 -> <clinit>
+    1924:1925:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.initFields():1634:1635 -> <clinit>
+    1924:1925:void <clinit>():2094 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):71:71 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):71:71 -> <init>
+    3:1589:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):77:1663 -> <init>
+    1590:1590:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):78:78 -> <init>
+    1591:3175:void <init>(boolean):80:80 -> <init>
+    3176:4744:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):95:1663 -> <init>
+    4745:4793:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):96:144 -> <init>
+    4794:4797:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):128:131 -> <init>
+    4798:4830:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):120:152 -> <init>
+    4831:4849:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):150:168 -> <init>
+    4850:4860:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):156:166 -> <init>
+    1:1:java.util.List access$1400(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):71:71 -> a
+    2:2:java.util.List access$1402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):71:71 -> a
+    3:5:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):1649:1651 -> a
+    6:6:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.getLocalNameList():1609:1609 -> a
+    6:6:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):1653 -> a
+    7:14:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):1653:1660 -> a
+    1:1:java.util.List access$1500(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):71:71 -> b
+    2:2:java.util.List access$1502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):71:71 -> b
+    3:7:boolean isInitialized():1639:1643 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$1600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):71:71 -> c
+    2:13:int getSerializedSize():1665:1676 -> c
+    14:14:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.getLocalNameList():1609:1609 -> c
+    14:14:int getSerializedSize():1680 -> c
+    15:23:int getSerializedSize():1680:1688 -> c
+    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.newBuilder():1752:1752 -> d
+    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.newBuilderForType():1753 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():71 -> d
+    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.newBuilder():1752:1752 -> e
+    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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1755 -> e
+    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.toBuilder():1757 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():71 -> e
+    2:2: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.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1755:1755 -> e
+    2:2: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.toBuilder():1757 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():71 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getDefaultInstance():84:84 -> g
+    1:1:java.util.List getLocalNameList():1609:1609 -> h
+    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.el:
+    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.fl:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
-    1:227:void <init>():1768:1994 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):1761:1761 -> a
-    2:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1820:1841 -> a
-    24:30: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1856:1862 -> a
-    24:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1761 -> a
-    31:35: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1858:1862 -> a
-    31:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1761 -> a
-    36:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder addAllLocalName(java.lang.Iterable):2068:2069 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder addAllRecord(java.lang.Iterable):1969:1970 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1796:1797 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():1761 -> c
+    1:227:void <init>():1769:1995 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):1762:1762 -> a
+    2:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1821:1842 -> a
+    24:30: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1857:1863 -> a
+    24:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1762 -> a
+    31:35: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.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1859:1863 -> a
+    31:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1762 -> a
+    36:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder addAllLocalName(java.lang.Iterable):2069:2070 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder addAllRecord(java.lang.Iterable):1970:1971 -> b
+    1:2: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():1797:1798 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():1762 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1798 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():1761 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1798:1798 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():1761 -> c
-    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():1775:1775 -> clone
-    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.clone():1788 -> clone
-    1:1:java.lang.Object clone():1761 -> clone
-    2:2: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.clone():1788:1788 -> clone
-    2:2:java.lang.Object clone():1761 -> clone
-    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():1775:1775 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1761 -> f
-    1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1804:1815 -> g
-    1:3:void ensureLocalNameIsMutable():1996:1998 -> h
-    1:3:void ensureRecordIsMutable():1872:1874 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.Nk:
+    3:3: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 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():1762 -> c
+    4:4: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 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():1762 -> c
+    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 -> clone
+    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.clone():1789 -> clone
+    1:1:java.lang.Object clone():1762 -> clone
+    2:2: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.clone():1789:1789 -> clone
+    2:2:java.lang.Object clone():1762 -> clone
+    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
+    1:3:void ensureLocalNameIsMutable():1997:1999 -> h
+    1:3:void ensureRecordIsMutable():1873:1875 -> i
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.jl:
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int replaceCharMemoizedSerializedSize -> j
@@ -63419,100 +63762,100 @@
     java.util.List substringIndex_ -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation operation_ -> f
-    1:1088:void <clinit>():469:1556 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):328:328 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):328:328 -> <init>
-    3:491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):334:822 -> <init>
-    492:492:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):335:335 -> <init>
-    493:979:void <init>(boolean):337:337 -> <init>
-    980:1450:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):352:822 -> <init>
-    1451:1540:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):353:442 -> <init>
-    1541:1550:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):427:436 -> <init>
-    1551:1554:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):420:423 -> <init>
-    1555:1564:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):406:415 -> <init>
-    1565:1568:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):399:402 -> <init>
-    1569:1576:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):386:393 -> <init>
-    1577:1578:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):381:382 -> <init>
-    1579:1653:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):376:450 -> <init>
-    1654:1672:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):448:466 -> <init>
-    1673:1683:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):454:464 -> <init>
-    1:1:int access$1002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):328:328 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$1100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> a
-    3:3:java.lang.Object access$602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.lang.Object):328:328 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation access$702(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$Operation):328:328 -> a
-    5:5:java.util.List access$802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):328:328 -> a
-    6:14:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):792:800 -> a
-    15:15:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getSubstringIndexList():706:706 -> a
-    15:15:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):802 -> a
-    16:21:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):802:807 -> a
-    22:22:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getReplaceCharList():746:746 -> a
-    22:22:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):809 -> a
-    23:30:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):809:816 -> a
-    31:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getStringBytes():658:666 -> a
-    31:39:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):817 -> a
-    40:42:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):817:819 -> a
-    1:1:int access$402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):328:328 -> b
-    2:2:java.lang.Object access$600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> b
-    3:3:java.util.List access$902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):328:328 -> b
-    4:8:boolean isInitialized():782:786 -> b
-    1:1:int access$502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):328:328 -> c
-    2:2:java.util.List access$800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> c
-    3:22:int getSerializedSize():824:843 -> c
-    23:23:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getSubstringIndexList():706:706 -> c
-    23:23:int getSerializedSize():847 -> c
-    24:34:int getSerializedSize():847:857 -> c
-    35:35:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getReplaceCharList():746:746 -> c
-    35:35:int getSerializedSize():861 -> c
-    36:43:int getSerializedSize():861:868 -> c
-    44:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getStringBytes():658:666 -> c
-    44:52:int getSerializedSize():869 -> c
+    1:1088:void <clinit>():470:1557 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):329:329 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1):329:329 -> <init>
+    3:491:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):335:823 -> <init>
+    492:492:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):336:336 -> <init>
+    493:979:void <init>(boolean):338:338 -> <init>
+    980:1450:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):353:823 -> <init>
+    1451:1540:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):354:443 -> <init>
+    1541:1550:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):428:437 -> <init>
+    1551:1554:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):421:424 -> <init>
+    1555:1564:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):407:416 -> <init>
+    1565:1568:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):400:403 -> <init>
+    1569:1576:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):387:394 -> <init>
+    1577:1578:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):382:383 -> <init>
+    1579:1653:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):377:451 -> <init>
+    1654:1672:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):449:467 -> <init>
+    1673:1683:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):455:465 -> <init>
+    1:1:int access$1002(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):329:329 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString access$1100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):329:329 -> a
+    3:3:java.lang.Object access$602(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.lang.Object):329:329 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation access$702(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$Operation):329:329 -> a
+    5:5:java.util.List access$802(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):329:329 -> a
+    6:14:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):793:801 -> a
+    15:15:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getSubstringIndexList():707:707 -> a
+    15:15:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):803 -> a
+    16:21:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):803:808 -> a
+    22:22:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getReplaceCharList():747:747 -> a
+    22:22:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):810 -> a
+    23:30:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):810:817 -> a
+    31:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getStringBytes():659:667 -> a
+    31:39:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):818 -> a
+    40:42:void writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):818:820 -> a
+    1:1:int access$402(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):329:329 -> b
+    2:2:java.lang.Object access$600(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):329:329 -> b
+    3:3:java.util.List access$902(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,java.util.List):329:329 -> b
+    4:8:boolean isInitialized():783:787 -> b
+    1:1:int access$502(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):329:329 -> c
+    2:2:java.util.List access$800(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):329:329 -> c
+    3:22:int getSerializedSize():825:844 -> c
+    23:23:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getSubstringIndexList():707:707 -> c
+    23:23:int getSerializedSize():848 -> c
+    24:34:int getSerializedSize():848:858 -> c
+    35:35:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getReplaceCharList():747:747 -> c
+    35:35:int getSerializedSize():862 -> c
+    36:43:int getSerializedSize():862:869 -> c
+    44:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getStringBytes():659:667 -> c
+    44:52:int getSerializedSize():870 -> c
     53:53:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeBytesSize(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):637:637 -> c
-    53:53:int getSerializedSize():869 -> c
+    53:53:int getSerializedSize():870 -> c
     54:54:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeBytesSizeNoTag(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):883:883 -> c
     54:54:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.computeBytesSize(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):637 -> c
-    54:54:int getSerializedSize():869 -> c
-    55:56:int getSerializedSize():872:873 -> c
-    1:1:java.util.List access$900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):328:328 -> d
-    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():937:937 -> d
-    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.newBuilderForType():938 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():328 -> d
-    1:1: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():937:937 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):940 -> e
-    1:1: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.toBuilder():942 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():328 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):940:940 -> e
-    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.toBuilder():942 -> e
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():328 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record getDefaultInstance():341:341 -> g
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation getOperation():690:690 -> h
-    1:1:int getPredefinedIndex():613:613 -> i
-    1:1:int getRange():590:590 -> j
-    1:1:int getReplaceCharCount():757:757 -> k
-    1:1:java.util.List getReplaceCharList():746:746 -> l
-    1:7:java.lang.String getString():636:642 -> m
+    54:54:int getSerializedSize():870 -> c
+    55:56:int getSerializedSize():873:874 -> c
+    1:1:java.util.List access$900(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):329:329 -> d
+    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():938:938 -> d
+    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.newBuilderForType():939 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():329 -> d
+    1:1: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():938:938 -> e
+    1:1: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 -> e
+    1:1: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.toBuilder():943 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():329 -> e
+    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 -> e
+    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.toBuilder():943 -> e
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():329 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record getDefaultInstance():342:342 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation getOperation():691:691 -> h
+    1:1:int getPredefinedIndex():614:614 -> i
+    1:1:int getRange():591:591 -> j
+    1:1:int getReplaceCharCount():758:758 -> k
+    1:1:java.util.List getReplaceCharList():747:747 -> l
+    1:7:java.lang.String getString():637:643 -> m
     8:8:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.toStringUtf8():624:624 -> m
-    8:8:java.lang.String getString():642 -> m
-    9:10:java.lang.String getString():643:644 -> m
+    8:8:java.lang.String getString():643 -> m
+    9:10:java.lang.String getString():644:645 -> m
     11:11:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString.toStringUtf8():626:626 -> m
-    11:11:java.lang.String getString():642 -> m
-    1:1:int getSubstringIndexCount():718:718 -> n
-    1:1:java.util.List getSubstringIndexList():706:706 -> o
-    1:1:boolean hasOperation():680:680 -> p
-    1:1:boolean hasPredefinedIndex():603:603 -> q
-    1:1:boolean hasRange():580:580 -> r
-    1:1:boolean hasString():626:626 -> s
-    1:6:void initFields():773:778 -> t
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder():937:937 -> u
-    1:1: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():937:937 -> v
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):940 -> v
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):940:940 -> v
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.Kk:
-    1:1:void <init>():470:470 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):475:475 -> a
-    1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):470 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.Lk:
+    11:11:java.lang.String getString():643 -> m
+    1:1:int getSubstringIndexCount():719:719 -> n
+    1:1:java.util.List getSubstringIndexList():707:707 -> o
+    1:1:boolean hasOperation():681:681 -> p
+    1:1:boolean hasPredefinedIndex():604:604 -> q
+    1:1:boolean hasRange():581:581 -> r
+    1:1:boolean hasString():627:627 -> s
+    1:6:void initFields():774:779 -> t
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder():938:938 -> u
+    1:1: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():938:938 -> v
+    1:1: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 -> v
+    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.gl:
+    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.hl:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -63520,64 +63863,64 @@
     int bitField0_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation operation_ -> f
     int range_ -> c
-    1:497:void <init>():954:1450 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):947:947 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1032:1034 -> a
-    5:6: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$Builder.setRange(int):1124:1125 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1034 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1036:1037 -> a
-    9:10: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$Builder.setPredefinedIndex(int):1172:1173 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1037 -> a
-    11:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1039:1045 -> a
-    18:21: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$Builder.setOperation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation):1321:1324 -> a
-    18:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1045 -> a
-    22:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1047:1050 -> a
-    26:28:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.ensureSubstringIndexIsMutable():1344:1346 -> a
-    26:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1052 -> a
-    29:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1053:1060 -> a
-    37:39:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.ensureReplaceCharIsMutable():1452:1454 -> a
-    37:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1062 -> a
-    40:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1063:1067 -> a
-    45:51: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$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1082:1088 -> a
-    45:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):947 -> a
-    52:56: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$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1084:1088 -> a
-    52:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):947 -> a
-    57:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder setPredefinedIndex(int):1172:1173 -> a
-    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder setOperation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation):1323:1324 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder setRange(int):1124:1125 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():990:991 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():947 -> c
+    1:497:void <init>():955:1451 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):948:948 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1033:1035 -> a
+    5:6: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$Builder.setRange(int):1125:1126 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1035 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1037:1038 -> a
+    9:10: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$Builder.setPredefinedIndex(int):1173:1174 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1038 -> a
+    11:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1040:1046 -> a
+    18:21: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$Builder.setOperation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation):1322:1325 -> a
+    18:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1046 -> a
+    22:25:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1048:1051 -> a
+    26:28:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.ensureSubstringIndexIsMutable():1345:1347 -> a
+    26:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1053 -> a
+    29:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1054:1061 -> a
+    37:39:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.ensureReplaceCharIsMutable():1453:1455 -> a
+    37:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1063 -> a
+    40:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1064:1068 -> a
+    45:51: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$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1083:1089 -> a
+    45:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):948 -> a
+    52:56: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$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1085:1089 -> a
+    52:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):948 -> a
+    57:58:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder setPredefinedIndex(int):1173:1174 -> a
+    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder setOperation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation):1324:1325 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder setRange(int):1125:1126 -> b
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():991:992 -> c
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():948 -> c
     3:3: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 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():992 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():947 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():992:992 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():947 -> c
-    1:1: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$Builder.create():961:961 -> clone
-    1:1: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$Builder.clone():982 -> clone
-    1:1:java.lang.Object clone():947 -> clone
-    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$Builder.clone():982:982 -> clone
-    2:2:java.lang.Object clone():947 -> clone
-    1:1: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$Builder.create():961:961 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder access$200():947 -> f
-    1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():998:1027 -> g
-    1:1:int getRange():1114:1114 -> h
-    1:1:int getReplaceCharCount():1478:1478 -> i
-    1:1:int getSubstringIndexCount():1372:1372 -> j
-    1:1:boolean hasOperation():1300:1300 -> k
-    1:1:boolean hasPredefinedIndex():1152:1152 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.Mk:
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():948 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993:993 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():948 -> c
+    1:1: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$Builder.create():962:962 -> clone
+    1:1: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$Builder.clone():983 -> clone
+    1:1:java.lang.Object clone():948 -> clone
+    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$Builder.clone():983:983 -> clone
+    2:2:java.lang.Object clone():948 -> clone
+    1:1: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$Builder.create():962:962 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder access$200():948 -> f
+    1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():999:1028 -> g
+    1:1:int getRange():1115:1115 -> h
+    1:1:int getReplaceCharCount():1479:1479 -> i
+    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.il:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation NONE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> d
     int value -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> c
-    1:19:void <clinit>():492:510 -> <clinit>
-    20:20:void <clinit>():487:487 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int,int):562:563 -> <init>
-    1:1:int getNumber():537:537 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> d
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> d
+    1:19:void <clinit>():493:511 -> <clinit>
+    20:20:void <clinit>():488:488 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int,int):563:564 -> <init>
+    1:1:int getNumber():538:538 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):544:544 -> d
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> d
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> d
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.F2:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
@@ -63607,48 +63950,47 @@
     263:279:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding.decode7to8(byte[]):247:263 -> a
     263:279:byte[] decodeBytes(java.lang.String[]):192 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.D6:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
-    java.util.Map map -> a
-    1:10:void <clinit>():20:29 -> <clinit>
-    11:11:void <clinit>():21:21 -> <clinit>
-    12:165:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getIndices(java.util.Collection):0:153 -> <clinit>
-    12:165:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getIndices(java.util.Collection):0 -> <clinit>
-    12:165:void <clinit>():32 -> <clinit>
-    166:743:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0:577 -> <clinit>
-    166:743:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    166:743:void <clinit>():32 -> <clinit>
-    744:744:void com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt.checkStepIsPositive(boolean,java.lang.Number):0:0 -> <clinit>
-    744:744:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):577 -> <clinit>
-    744:744:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    744:744:void <clinit>():32 -> <clinit>
-    745:745:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):578:578 -> <clinit>
-    745:745:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    745:745:void <clinit>():32 -> <clinit>
-    746:746:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion.fromClosedRange(int,int,int):122:122 -> <clinit>
-    746:746:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):578 -> <clinit>
-    746:746:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0 -> <clinit>
-    746:746:void <clinit>():32 -> <clinit>
-    747:784:void <clinit>():32:69 -> <clinit>
-    785:785:void <clinit>():20:20 -> <clinit>
-    1:1:java.lang.String mapClass(java.lang.String):78:78 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.internal.B6:
+    java.util.Map map -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite INSTANCE -> c
+    java.lang.String kotlin -> a
+    1:17:void <clinit>():15:31 -> <clinit>
+    18:18:void <clinit>():23:23 -> <clinit>
+    19:232:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.getIndices(java.util.Collection):0:213 -> <clinit>
+    19:232:void <clinit>():34 -> <clinit>
+    233:889:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):0:656 -> <clinit>
+    233:889:void <clinit>():34 -> <clinit>
+    890:890:void com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt.checkStepIsPositive(boolean,java.lang.Number):0:0 -> <clinit>
+    890:890:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):656 -> <clinit>
+    890:890:void <clinit>():34 -> <clinit>
+    891:891:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):657:657 -> <clinit>
+    891:891:void <clinit>():34 -> <clinit>
+    892:892:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion.fromClosedRange(int,int,int):122:122 -> <clinit>
+    892:892:com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.step(com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression,int):657 -> <clinit>
+    892:892:void <clinit>():34 -> <clinit>
+    893:930:void <clinit>():34:71 -> <clinit>
+    931:931:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>():15:15 -> <init>
+    1:1:java.lang.String access$getKotlin$p(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite):15:15 -> a
+    2:2:java.lang.String mapClass(java.lang.String):80:80 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.internal.C6:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map $this_apply -> a
     1:1:java.lang.Object invoke(java.lang.Object,java.lang.Object):15:15 -> a
-    2:2:void invoke(java.lang.String,java.lang.String):40:40 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.internal.Qj:
+    2:2:void invoke(java.lang.String,java.lang.String):42:42 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.internal.mk:
 # {"id":"sourceFile","fileName":"JvmBytecodeBinaryVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion INSTANCE -> f
     1:4:void <clinit>():19:22 -> <clinit>
     1:1:void <init>(int[]):14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.fk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.Bk:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
     java.lang.String asString() -> a
     1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.ck:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.yk:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -63674,7 +64016,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.dk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.zk:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -63700,19 +64042,19 @@
     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.qk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Mk:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
-    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <clinit>():29:29 -> <clinit>
     2:17:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.<init>(int[]):0:15 -> <clinit>
-    2:17:void <clinit>():30 -> <clinit>
-    18:21:void <clinit>():30:33 -> <clinit>
+    2:17:void <clinit>():29 -> <clinit>
+    18:21:void <clinit>():29:32 -> <clinit>
     22:37:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.<init>(int[]):0:15 -> <clinit>
-    22:37:void <clinit>():33 -> <clinit>
+    22:37:void <clinit>():32 -> <clinit>
     1:1:void <init>(int[],boolean):14:14 -> <init>
-    1:6:boolean isCompatible():20:25 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.tk:
+    1:5:boolean isCompatible():20:24 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.Pk:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.List records -> b
     java.util.List PREDEFINED_STRINGS -> e
@@ -63721,67 +64063,66 @@
     java.util.Set localNameIndices -> a
     java.util.Map PREDEFINED_STRINGS_MAP -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion Companion -> g
-    1:32:void <clinit>():78:78 -> <clinit>
-    65:75:void <clinit>():111:111 -> <clinit>
-    86:86:void <clinit>():122:122 -> <clinit>
-    1:16:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):13:28 -> <init>
-    17:17:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):20:20 -> <init>
+    1:33:void <clinit>():81:113 -> <clinit>
+    34:77:void <clinit>():83:126 -> <clinit>
+    78:86:void <clinit>():116:124 -> <clinit>
+    1:18:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):13:30 -> <init>
+    19:19:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):22:22 -> <init>
     1:1:java.util.Map access$getPREDEFINED_STRINGS_MAP$cp():13:13 -> a
-    2:34:java.lang.String getString(int):32:64 -> a
-    35:45:java.lang.String getString(int):58:68 -> a
-    1:1:java.util.List getRecords():20:20 -> b
-    2:2:boolean isLocalClassName(int):75:75 -> b
-    1:1:java.lang.String[] getStrings():15:15 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.sk:
+    2:34:java.lang.String getString(int):34:66 -> a
+    35:45:java.lang.String getString(int):60:70 -> a
+    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.JvmNameResolver$Companion -> com.android.tools.r8.internal.Ok:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
-    1:1:void <init>():77:77 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):77:77 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.Qk:
+    1:1:void <init>():79:79 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):79:79 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.ml:
 # {"id":"sourceFile","fileName":"JvmProtoBufUtil.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil INSTANCE -> b
     1:2:void <clinit>():18:19 -> <clinit>
-    3:15:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf.registerAllExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):10:22 -> <clinit>
-    3:15:void <clinit>():19 -> <clinit>
-    16:16:void <clinit>():19:19 -> <clinit>
+    3:16:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf.registerAllExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):10:23 -> <clinit>
+    3:16:void <clinit>():19 -> <clinit>
+    17:17:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,boolean):0:121 -> a
     1:122:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
     123:123:com.android.tools.r8.jetbrains.kotlin.Pair readClassDataFrom(java.lang.String[],java.lang.String[]):27:27 -> a
     124:156:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):0:32 -> a
     124:156:com.android.tools.r8.jetbrains.kotlin.Pair readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> a
-    157:157:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):9650:9650 -> a
+    157:157:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):9654:9654 -> a
     157:157:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):32 -> a
     157:157:com.android.tools.r8.jetbrains.kotlin.Pair readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> a
     158:158:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):32:32 -> a
     158:158:com.android.tools.r8.jetbrains.kotlin.Pair readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> a
     159:159:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52:52 -> a
-    160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.parseDelimitedFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1737:1737 -> a
+    160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.parseDelimitedFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1738:1738 -> a
     160:160:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52 -> a
     161:161:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52:52 -> a
-    162:228:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:136 -> a
-    229:294:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75:140 -> a
-    295:300:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):77:82 -> a
-    301:355:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):90:144 -> a
-    356:359:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):100:103 -> a
-    360:360:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
-    361:361:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):72:72 -> a
-    361:361:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126 -> a
-    362:362:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
+    162:232:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:140 -> a
+    233:302:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):75:144 -> a
+    303:308:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):77:82 -> a
+    309:367:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):90:148 -> a
+    368:371:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):100:103 -> a
+    372:372:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
+    373:373:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):74:74 -> a
+    373:373:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126 -> a
+    374:374:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):126:126 -> a
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair readFunctionDataFrom(java.lang.String[],java.lang.String[]):47:48 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15000:15000 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):15020:15020 -> b
     3:3:com.android.tools.r8.jetbrains.kotlin.Pair readFunctionDataFrom(java.lang.String[],java.lang.String[]):48 -> b
     4:4:com.android.tools.r8.jetbrains.kotlin.Pair readFunctionDataFrom(java.lang.String[],java.lang.String[]):48:48 -> b
     1:1:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37:37 -> c
     2:44:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):0:42 -> c
     2:44:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
-    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11972:11972 -> c
+    45:45:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11980:11980 -> c
     45:45: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 -> c
     45:45:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42:42 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.nl:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -63793,39 +64134,39 @@
     1:1:java.util.ArrayList getStrings():16:16 -> a
     2:72:int getStringIndex(java.lang.String):33:103 -> a
     73:76:int getStringIndex(java.lang.String):34:37 -> a
-    77:518:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.lastOrNull(java.util.List):0:441 -> a
-    77:518:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.lastOrNull(java.util.List):0 -> a
-    77:518:int getStringIndex(java.lang.String):37 -> a
-    519:519:int getStringIndex(java.lang.String):37:37 -> a
-    520:520:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable.isTrivial(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder):45:45 -> a
-    520:520:int getStringIndex(java.lang.String):38 -> a
-    521:588:int getStringIndex(java.lang.String):39:106 -> a
-    589:589:int getStringIndex(java.lang.String):104:104 -> a
-    590:609:int getQualifiedClassNameIndex(java.lang.String,boolean):57:76 -> a
-    610:723:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion.getPredefinedStringIndex(java.lang.String):0:113 -> a
-    610:723:int getQualifiedClassNameIndex(java.lang.String,boolean):76 -> a
-    724:729:int getQualifiedClassNameIndex(java.lang.String,boolean):78:83 -> a
-    730:745:int getQualifiedClassNameIndex(java.lang.String,boolean):74:89 -> a
-    746:763:void serializeTo(java.io.OutputStream):95:112 -> a
-    764:765:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():990:991 -> a
-    764:765:void serializeTo(java.io.OutputStream):96 -> a
-    766:766:void serializeTo(java.io.OutputStream):96:96 -> a
-    767:767:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    767:767:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():992 -> a
-    767:767:void serializeTo(java.io.OutputStream):96 -> a
-    768:768:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():992:992 -> a
-    768:768:void serializeTo(java.io.OutputStream):96 -> a
-    769:770:void serializeTo(java.io.OutputStream):96:97 -> a
-    771:772:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1796:1797 -> a
-    771:772:void serializeTo(java.io.OutputStream):98 -> a
-    773:780:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeDelimitedTo(java.io.OutputStream):86:93 -> a
-    773:780:void serializeTo(java.io.OutputStream):98 -> a
-    781:781:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    781:781:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1798 -> a
-    781:781:void serializeTo(java.io.OutputStream):98 -> a
-    782:782:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1798:1798 -> a
-    782:782:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.Ai:
+    77:538:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.lastOrNull(java.util.List):0:461 -> a
+    77:538:int getStringIndex(java.lang.String):37 -> a
+    539:539:int getStringIndex(java.lang.String):37:37 -> a
+    540:540:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable.isTrivial(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder):45:45 -> a
+    540:540:int getStringIndex(java.lang.String):38 -> a
+    541:542:int getStringIndex(java.lang.String):39:40 -> a
+    543:615:int getStringIndex(java.lang.String):34:106 -> a
+    616:616:int getStringIndex(java.lang.String):104:104 -> a
+    617:636:int getQualifiedClassNameIndex(java.lang.String,boolean):57:76 -> a
+    637:755:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion.getPredefinedStringIndex(java.lang.String):0:118 -> a
+    637:755:int getQualifiedClassNameIndex(java.lang.String,boolean):76 -> a
+    756:761:int getQualifiedClassNameIndex(java.lang.String,boolean):78:83 -> a
+    762:777:int getQualifiedClassNameIndex(java.lang.String,boolean):74:89 -> a
+    778:795:void serializeTo(java.io.OutputStream):95:112 -> a
+    796:797:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():991:992 -> a
+    796:797:void serializeTo(java.io.OutputStream):96 -> a
+    798:798:void serializeTo(java.io.OutputStream):96:96 -> a
+    799:799:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    799:799:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993 -> a
+    799:799:void serializeTo(java.io.OutputStream):96 -> a
+    800:800:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.build():993:993 -> a
+    800:800:void serializeTo(java.io.OutputStream):96 -> a
+    801:802:void serializeTo(java.io.OutputStream):96:97 -> a
+    803:804: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():1797:1798 -> a
+    803:804:void serializeTo(java.io.OutputStream):98 -> a
+    805:812:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeDelimitedTo(java.io.OutputStream):86:93 -> a
+    805:812:void serializeTo(java.io.OutputStream):98 -> a
+    813:813:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    813:813: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 -> a
+    813:813:void serializeTo(java.io.OutputStream):98 -> a
+    814:814: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
+    814:814:void serializeTo(java.io.OutputStream):98 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.Vi:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
@@ -63834,14 +64175,13 @@
     20:23:java.lang.Integer find(java.lang.Object):19:22 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:3:int intern(java.lang.Object):26:27 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.internal.zi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.internal.Ui:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap receiver$0$inlined -> a
-    1:220:int compare(java.lang.Object,java.lang.Object):102:321 -> compare
-    221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
-    221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):0 -> compare
-    221:221:int compare(java.lang.Object,java.lang.Object):321 -> compare
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.is:
+    1:219:int compare(java.lang.Object,java.lang.Object):102:320 -> compare
+    220:220:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
+    220:220:int compare(java.lang.Object,java.lang.Object):320 -> compare
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.Bs:
 # {"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>
@@ -63870,7 +64210,7 @@
     42:102:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():44:44 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.JE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.lF:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> c
@@ -64009,7 +64349,7 @@
     3:3:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.M7:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -64117,7 +64457,7 @@
     7:7:int readTag():158 -> p
     8:8:int readTag():158:158 -> p
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.N7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.O7:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -64214,9 +64554,9 @@
     1:6:void writeRawByte(int):1042 -> f
     1:4:void writeRawLittleEndian32(int):1246:1249 -> g
     1:4:void writeRawVarint32(int):1195:1198 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.N7:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.dc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.ec:
     java.util.Map extensionsByNumber -> a
     int $r8$clinit -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> b
@@ -64234,13 +64574,13 @@
     6:6:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830 -> a
     6:6:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     7:7:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.cc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.dc:
     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.Hc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Ic:
     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
     boolean isImmutable -> b
@@ -64493,8 +64833,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.Gc:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Hd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Hc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.ce:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -64586,15 +64926,15 @@
     144:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
     145:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> a
     147:149:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):735:737 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.Bd:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.Xd:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     1:45:void <init>():87:131 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder setUnknownFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):127:127 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.Dd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.Yd:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -64627,7 +64967,7 @@
     19:19:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> b
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> b
     1:3:void ensureExtensionsIsMutable():350:352 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Zd:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> a
     1:2:void <init>():171:172 -> <init>
     3:4:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):175:176 -> <init>
@@ -64663,7 +65003,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.Ed$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.Zd$a:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     boolean messageSetWireFormat -> c
@@ -64699,7 +65039,7 @@
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):355 -> a
     14:14:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
     15:20:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):296:301 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.Fd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.ae:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -64710,7 +65050,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.Gd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.be:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -64732,14 +65072,14 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> b
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.ti:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.Oi:
     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.ri:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.Mi:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.si:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.Ni:
     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.Gi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.bj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -64748,14 +65088,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException negativeSize():78:78 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException recursionLimitExceeded():104:104 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.to:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.Qo:
     java.util.Iterator iterator -> a
     1:2:void <init>(java.util.Iterator):130:131 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:2:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator.next():142:143 -> next
     1:2:java.lang.Object next():127 -> next
     1:1:void remove():151:151 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.hp:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.Ep:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -64787,8 +65127,8 @@
     1:9:int hashCode():251:259 -> hashCode
     1:1:java.util.Iterator iterator():52:52 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.fp:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.Cp:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.Dp:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -64799,12 +65139,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.Kq:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.ir:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> a
     boolean isInitialized() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.pv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.Jv:
     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.jB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.KB:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -64854,8 +65194,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.iterator():779:779 -> iterator
     1:1:java.util.Iterator iterator():70 -> iterator
     1:1:int size():269:269 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.fB:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.GB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.HB:
     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>
@@ -64877,7 +65217,7 @@
     47:47:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer.insert(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):664:664 -> a
     47:47:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):629 -> a
     48:53:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):630:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.hB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.IB:
     java.util.Stack breadCrumbs -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):716:716 -> <init>
@@ -64898,7 +65238,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> k
     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.iB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.JB:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> a
     int bytesRemaining -> c
@@ -64909,7 +65249,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator.next():799:799 -> next
     1:1:java.lang.Object next():782 -> next
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.internal.qC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.internal.QC:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -64944,7 +65284,7 @@
     1:9:void makeImmutable():161:169 -> m
     1:13:java.lang.Object remove(java.lang.Object):279:291 -> remove
     1:1:int size():202:202 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.mC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.MC:
     1:1:void <init>(int):100:100 -> <init>
     1:5:void makeImmutable():104:108 -> m
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
@@ -64954,20 +65294,20 @@
     14:14:void makeImmutable():115 -> m
     15:20:void makeImmutable():116:121 -> m
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):100:100 -> put
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.pC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.PC:
     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.nC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.NC:
     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.oC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.OC:
     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.qC$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.QC$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -64991,7 +65331,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.qC$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.QC$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -65004,7 +65344,7 @@
     1:7:java.lang.Object next():532 -> next
     1:10:void remove():557:566 -> remove
     11:11:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.qC$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.QC$c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):470:470 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):470:470 -> <init>
@@ -65016,9 +65356,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.PF:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.pG:
     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.lG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.HG:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -65027,10 +65367,10 @@
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
     2:38:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.ZG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.vH:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.SG:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.XG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.oH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.tH:
     int wireType -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType DOUBLE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType[] $VALUES -> u
@@ -65059,18 +65399,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.TG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.pH:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):116:116 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.UG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.qH:
     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.VG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.rH:
     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.WG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.sH:
     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.YG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.uH:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> d
@@ -65085,7 +65425,7 @@
     1:9:void <clinit>():78:86 -> <clinit>
     10:10:void <clinit>():77:77 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):88:89 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.Sj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.ok:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():78:78 -> <clinit>
@@ -65098,7 +65438,7 @@
     1:1:void visitEnd():68 -> b
     2:2:void visitEnd():68:68 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():54:54 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.Vj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.rk:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():260:260 -> <clinit>
@@ -65106,31 +65446,31 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):237:237 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():240:240 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.Wj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.sk:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor):14:14 -> <init>
     void visitModuleName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor getDelegate():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.Yj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.uk:
 # {"id":"sourceFile","fileName":"jvmExtensions.kt"}
     1:32:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:31 -> a
-    1:32:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):167 -> a
-    33:33:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):167:167 -> a
+    1:32:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):169 -> a
+    33:33:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):169:169 -> a
     34:59: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):0:25 -> a
-    34:59:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):143 -> a
-    60:60:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):143:143 -> a
+    34:59:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):145 -> a
+    60:60:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):145:145 -> a
     61:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> a
-    61:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):69 -> a
-    81:81:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):69:69 -> a
-    82:82:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature getFieldSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):99:99 -> a
+    61:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):71 -> a
+    81:81:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):71:71 -> a
+    82:82:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature getFieldSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):101:101 -> a
     1:32:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:31 -> b
-    1:32:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):158 -> b
-    33:33:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):158:158 -> b
-    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):110:110 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):121:121 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.Zj:
+    1:32:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):160 -> b
+    33:33:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):160:160 -> b
+    34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):112:112 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):123:123 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.vk:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -65147,7 +65487,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.bk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.xk:
 # {"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
@@ -65158,7 +65498,7 @@
     2:2:void visitLambdaClassOriginName(java.lang.String):137:137 -> a
     3:3:void visitEnd():144:144 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():119:119 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.ek:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.Ak:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):16:16 -> <init>
@@ -65166,7 +65506,7 @@
     java.lang.String getDesc() -> b
     java.lang.String getName() -> c
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.rk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.Nk:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -65183,7 +65523,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.vk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.Rk:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():108:108 -> <clinit>
@@ -65195,7 +65535,7 @@
     1:1:void visitEnd():98 -> b
     2:2:void visitEnd():98:98 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():92:92 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.xk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.Tk:
 # {"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
@@ -65209,7 +65549,16 @@
     4:4:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):212:212 -> a
     5:5:void visitEnd():219:219 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():165:165 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Tk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.pl:
+# {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor delegate -> a
+    1:1:void <clinit>():375:375 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor):355:355 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):356:356 -> <init>
+    1:1:void visitEnd():365:365 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():359:359 -> getType
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.rl:
 # {"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
@@ -65220,7 +65569,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):324:324 -> a
     2:2:void visitEnd():331:331 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():307:307 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Vk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.tl:
 # {"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
@@ -65230,7 +65579,16 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279:279 -> a
     2:2:void visitEnd():286:286 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():271:271 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.Hm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor -> com.android.tools.r8.internal.vl:
+# {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
+    com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor delegate -> a
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
+    1:1:void <clinit>():402:402 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor):382:382 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):383:383 -> <init>
+    1:1:void visitEnd():392:392 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():386:386 -> getType
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.gn:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> g
     java.lang.String extraString -> f
@@ -65242,26 +65600,26 @@
     java.lang.String[] data1 -> d
     int[] COMPATIBLE_BYTECODE_VERSION -> j
     int kind -> a
-    1:9:void <clinit>():143:151 -> <clinit>
-    1:72:void <init>(java.lang.Integer,int[],int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):24:95 -> <init>
-    1:1:int[] getBytecodeVersion():60:60 -> a
-    1:1:java.lang.String[] getData1():67:67 -> b
-    1:1:java.lang.String[] getData2():74:74 -> c
-    1:1:int getExtraInt():95:95 -> d
-    1:1:java.lang.String getExtraString():81:81 -> e
-    1:1:int getKind():44:44 -> f
-    1:1:int[] getMetadataVersion():52:52 -> g
-    1:1:java.lang.String getPackageName():88:88 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.Km:
+    1:9:void <clinit>():145:153 -> <clinit>
+    1:72:void <init>(java.lang.Integer,int[],int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):26:97 -> <init>
+    1:1:int[] getBytecodeVersion():62:62 -> a
+    1:1:java.lang.String[] getData1():69:69 -> b
+    1:1:java.lang.String[] getData2():76:76 -> c
+    1:1:int getExtraInt():97:97 -> d
+    1:1:java.lang.String getExtraString():83:83 -> e
+    1:1:int getKind():46:46 -> f
+    1:1:int[] getMetadataVersion():54:54 -> g
+    1:1:java.lang.String getPackageName():90:90 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.jn:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader header -> a
+    com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion Companion -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.Km$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.jn$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
-    com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> b
+    com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40:40 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):0:0 -> b
@@ -65271,34 +65629,34 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
     4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):48:49 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.internal.Km$a$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.internal.jn$a$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():55:55 -> <init>
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):68:69 -> i
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-    3:75:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):0:72 -> i
-    3:75:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
-    3:75:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-    76:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9746:9747 -> i
-    76:77:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):72 -> i
-    76:77:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
-    76:77:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-    78:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):72:74 -> i
-    78:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
-    78:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-    81:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):73:76 -> i
-    81:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
-    81:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-    85:85: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 -> i
-    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748 -> i
-    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):72 -> i
-    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):66:66 -> i
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
+    2:72:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int):0:70 -> i
+    2:72:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):67 -> i
+    2:72:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
+    73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9750:9751 -> i
+    73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int):70 -> i
+    73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):67 -> i
+    73:74:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
+    75:78:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int):70:73 -> i
+    75:78:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):67 -> i
+    75:78:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
+    79:83:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int):71:75 -> i
+    79:83:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):67 -> i
+    79:83:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
+    84:84: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 -> i
+    84:84:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9752 -> i
+    84:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int):70 -> i
+    84:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):67 -> i
+    84:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9752:9752 -> i
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int):70 -> i
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int,int,java.lang.Object):67 -> i
     85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748:9748 -> i
-    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):72 -> i
-    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
-    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.internal.Km$a$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.internal.jn$a$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2.invoke():31:33 -> a
@@ -65310,144 +65668,151 @@
     5:5:java.lang.Object invoke():29 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2.invoke():32:32 -> a
     6:6:java.lang.Object invoke():29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.internal.Km$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.jn$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
-    com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> b
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95:95 -> b
+    1:1:void <init>():320:320 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):320:320 -> <init>
+    1:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.checkMetadataVersion(int[]):355:355 -> a
+    1:4:void access$checkMetadataVersion(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion,int[]):320 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.internal.jn$c:
+# {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
+    com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):83:84 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():94:94 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):0:0 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():94 -> b
     3:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.getPackageData():0:0 -> b
-    3:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):103 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
-    4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):103:104 -> b
-    4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.internal.Km$b$a:
+    3:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):102 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():94 -> b
+    4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):102:103 -> b
+    4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():94 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.internal.jn$c$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    1:1:void <init>():110:110 -> <init>
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):123:124 -> h
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
-    3:132:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write(int[],int[],int):0:129 -> h
-    3:132:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):125 -> h
-    3:132:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
-    133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write(int[],int[],int):128:131 -> h
-    133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):125 -> h
-    133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.internal.Km$b$b:
+    1:1:void <init>():109:109 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int,int,java.lang.Object):120:120 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
+    2:129:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write(int[],int):0:127 -> h
+    2:129:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int,int,java.lang.Object):121 -> h
+    2:129:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
+    130:134:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write(int[],int):125:129 -> h
+    130:134:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int,int,java.lang.Object):121 -> h
+    130:134:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.internal.jn$c$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
-    1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():86:88 -> a
-    1:3:java.lang.Object invoke():84 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():87:87 -> a
-    4:4:java.lang.Object invoke():84 -> a
+    1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():85:87 -> a
+    1:3:java.lang.Object invoke():83 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():86:86 -> a
+    4:4:java.lang.Object invoke():83 -> a
     5:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():87 -> a
-    5:5:java.lang.Object invoke():84 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():87:87 -> a
-    6:6:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.Km$c:
+    5:5:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():86 -> a
+    5:5:java.lang.Object invoke():83 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():86:86 -> a
+    6:6:java.lang.Object invoke():83 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.jn$d:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    java.util.List partClassNames -> b
-    1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
-    1:1:java.util.List getPartClassNames():221:221 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.Km$d:
+    java.util.List partClassNames -> c
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):214:218 -> <init>
+    1:1:java.util.List getPartClassNames():218:218 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.jn$e:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
-    com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> b
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277:277 -> b
+    com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):255:256 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():272:272 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):0:0 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():272 -> b
     3:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getPackageData():0:0 -> b
-    3:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):285 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
-    4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):285:286 -> b
-    4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.internal.Km$d$a:
+    3:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):280 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():272 -> b
+    4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):280:281 -> b
+    4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():272 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.internal.jn$e$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    1:1:void <init>():292:292 -> <init>
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):307:308 -> a
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
-    3:316:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write(java.lang.String,int[],int[],int):0:313 -> a
-    3:316:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):309 -> a
-    3:316:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
-    317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write(java.lang.String,int[],int[],int):312:315 -> a
-    317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):309 -> a
-    317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.internal.Km$d$b:
+    1:1:void <init>():287:287 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int,int,java.lang.Object):300:300 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
+    2:309:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write(java.lang.String,int[],int):0:307 -> a
+    2:309:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int,int,java.lang.Object):301 -> a
+    2:309:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
+    310:314:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write(java.lang.String,int[],int):305:309 -> a
+    310:314:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int,int,java.lang.Object):301 -> a
+    310:314:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.internal.jn$e$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
-    1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():262:264 -> a
-    1:3:java.lang.Object invoke():260 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():263:263 -> a
-    4:4:java.lang.Object invoke():260 -> a
+    1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():257:259 -> a
+    1:3:java.lang.Object invoke():255 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():258:258 -> a
+    4:4:java.lang.Object invoke():255 -> a
     5:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException.<init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():263 -> a
-    5:5:java.lang.Object invoke():260 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():263:263 -> a
-    6:6:java.lang.Object invoke():260 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.Km$e:
+    5:5:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():258 -> a
+    5:5:java.lang.Object invoke():255 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():258:258 -> a
+    6:6:java.lang.Object invoke():255 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.jn$f:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
-    com.android.tools.r8.jetbrains.kotlin.Lazy functionData$delegate -> b
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
-    1:1:boolean isLambda():159:159 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153:153 -> c
-    2:172:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):0:170 -> c
-    2:172:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
-    173:173:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.getFunctionData():0:0 -> c
-    173:173:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):174 -> c
-    173:173:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
-    174:176:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):174:174 -> c
-    174:176:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
-    177:177:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):170:170 -> c
-    177:177:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.internal.Lm:
+    com.android.tools.r8.jetbrains.kotlin.Lazy functionData$delegate -> c
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):138:139 -> <init>
+    1:1:boolean isLambda():157:157 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():151:151 -> c
+    2:170:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):0:168 -> c
+    2:170:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():151 -> c
+    171:171:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.getFunctionData():0:0 -> c
+    171:171:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):172 -> c
+    171:171:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():151 -> c
+    172:173:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor) -> c
+    172:173:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():151 -> c
+    174:174:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):168:168 -> c
+    174:174:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():151 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.internal.kn:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    1:1:void <init>():183:183 -> <init>
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):196:197 -> d
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-    3:206:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int[],int):0:203 -> d
-    3:206:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):198 -> d
-    3:206:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-    207:207:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int[],int):202:202 -> d
-    207:207:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):198 -> d
-    207:207:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-    208:212:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int[],int):201:205 -> d
-    208:212:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):198 -> d
-    208:212:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-    213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int[],int):204:207 -> d
-    213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):198 -> d
-    213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.internal.Mm:
+    1:1:void <init>():181:181 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int,int,java.lang.Object):192:192 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
+    2:201:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int):0:199 -> d
+    2:201:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int,int,java.lang.Object):193 -> d
+    2:201:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
+    202:202:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int):198:198 -> d
+    202:202:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int,int,java.lang.Object):193 -> d
+    202:202:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
+    203:208:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int):197:202 -> d
+    203:208:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int,int,java.lang.Object):193 -> d
+    203:208:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
+    209:213:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int):200:204 -> d
+    209:213:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int,int,java.lang.Object):193 -> d
+    209:213:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.internal.ln:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
-    1:2:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2.invoke():142:143 -> a
-    1:2:java.lang.Object invoke():140 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.Km$f:
+    1:2:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2.invoke():140:141 -> a
+    1:2:java.lang.Object invoke():138 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.jn$g:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):324:324 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.Rj:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):318:318 -> <init>
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.nk:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
     java.lang.String moduleName -> d
     1:2:void <init>():34:35 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34:34 -> a
-    2:182:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):0:180 -> a
-    2:182:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
-    183:187:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):53:57 -> a
-    183:187:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
-    188:188:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):51:51 -> a
-    188:188:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
-    189:189:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):40:40 -> a
-    190:190:void visitModuleName(java.lang.String):43:43 -> a
+    2:197:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):0:195 -> a
+    2:197:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
+    198:339:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):53:194 -> a
+    198:339:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
+    340:479:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):55:194 -> a
+    340:479:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
+    480:481:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):56:57 -> a
+    480:481:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
+    482:482:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor):51:51 -> a
+    482:482:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):34 -> a
+    483:483:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):40:40 -> a
+    484:484:void visitModuleName(java.lang.String):43:43 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):47:47 -> b
     1:1:java.lang.String getAnonymousObjectOriginName():37:37 -> c
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> d
     1:1:java.lang.String getModuleName():36:36 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Uj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.qk:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():133:133 -> <init>
@@ -65459,11 +65824,11 @@
     146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():134:134 -> a
     147:147:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):137:137 -> a
     1:1:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):134:134 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.tk:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.ak:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.wk:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -65477,141 +65842,144 @@
     103:103:void visitLambdaClassOriginName(java.lang.String):91:91 -> a
     1:1:java.lang.String getLambdaClassOriginName():84:84 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():83:83 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.pk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Lk:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:17 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):276:278 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):309:311 -> a
     2:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2411:2412 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2412:2413 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):312 -> a
     5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279:279 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):312:312 -> a
     7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):312 -> a
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413:2413 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414:2414 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):312 -> a
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    10:11:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor writeClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):108:109 -> a
-    12:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor writePackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):131:132 -> a
-    14:15:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):150:151 -> a
-    16:17:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor writePropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):167:168 -> a
-    18:19:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):225:226 -> a
-    20:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):238:239 -> a
-    22:23:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor writeTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):247:248 -> a
-    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension createClassExtension():261:261 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension createConstructorExtension():269:269 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension createFunctionExtension():265:265 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension createPackageExtension():263:263 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension createPropertyExtension():267:267 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():273:273 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():271:271 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.hk:
+    10:11:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor writeClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):115:116 -> a
+    12:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor writePackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):138:139 -> a
+    14:15:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):164:165 -> a
+    16:17:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor writePropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):181:182 -> a
+    18:19:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):239:240 -> a
+    20:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):252:253 -> a
+    22:23:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor writeTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):261:262 -> a
+    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension createClassExtension():287:287 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension createConstructorExtension():298:298 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension createFunctionExtension():294:294 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension createPackageExtension():289:289 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension createPropertyExtension():296:296 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension createTypeAliasExtension():304:304 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():302:302 -> g
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():300:300 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension createValueParameterExtension():306:306 -> i
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Dk:
 # {"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
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):109:109 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):116:116 -> a
-    2:3:void visitModuleName(java.lang.String):121:122 -> a
-    1:1:void visitAnonymousObjectOriginName(java.lang.String):111:111 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.gk:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):116:116 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):123:123 -> a
+    2:3:void visitModuleName(java.lang.String):128:129 -> a
+    1:1:void visitAnonymousObjectOriginName(java.lang.String):118:118 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Ck:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):109:109 -> a
-    2:119:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:117 -> a
-    2:119:java.lang.Object invoke(java.lang.Object):109 -> a
-    120:120:java.lang.Object invoke(java.lang.Object):109:109 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.ik:
+    1:1:java.lang.Object invoke(java.lang.Object):116:116 -> a
+    2:126:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:124 -> a
+    2:126:java.lang.Object invoke(java.lang.Object):116 -> a
+    127:127:java.lang.Object invoke(java.lang.Object):116:116 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Ek:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> b
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):226:226 -> <init>
-    1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):229:229 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.jk:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):240:240 -> <init>
+    1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):243:243 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Fk:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder $proto -> d
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):151:151 -> <init>
-    1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):154:154 -> a
-    2:2:void visitLambdaClassOriginName(java.lang.String):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.lk:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):165:165 -> <init>
+    1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):168:168 -> a
+    2:2:void visitLambdaClassOriginName(java.lang.String):173:173 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Hk:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder):132:132 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):135:135 -> a
-    2:3:void visitModuleName(java.lang.String):140:141 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.kk:
+    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):139:139 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):142:142 -> a
+    2:3:void visitModuleName(java.lang.String):147:148 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Gk:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 this$0 -> a
-    1:1:java.lang.Object invoke(java.lang.Object):132:132 -> a
-    2:138:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:136 -> a
-    2:138:java.lang.Object invoke(java.lang.Object):132 -> a
-    139:139:java.lang.Object invoke(java.lang.Object):132:132 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.mk:
+    1:1:java.lang.Object invoke(java.lang.Object):139:139 -> a
+    2:145:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:143 -> a
+    2:145:java.lang.Object invoke(java.lang.Object):139 -> a
+    146:146:java.lang.Object invoke(java.lang.Object):139:139 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Ik:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder signature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder $proto -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> f
     int jvmFlags -> c
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):168:169 -> <init>
-    1:12: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):178:189 -> a
-    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2873:2874 -> a
-    13:14: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):190 -> a
-    15:15: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):190:190 -> a
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):182:183 -> <init>
+    1:12: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):192:203 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2874:2875 -> a
+    13:14: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):204 -> a
+    15:15: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):204:204 -> a
     16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2875 -> a
-    16:16: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):190 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2875:2875 -> a
-    17:17: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):190 -> a
-    18:21: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):193:196 -> a
-    22:22: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):185:185 -> a
-    23:27:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):204:208 -> a
-    28:32:void visitEnd():212:216 -> a
-    33:34: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():3445:3446 -> a
-    33:34:void visitEnd():216 -> a
-    35:35:void visitEnd():216:216 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447 -> a
-    36:36:void visitEnd():216 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447:3447 -> a
-    37:37:void visitEnd():216 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.nk:
+    16:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876 -> a
+    16:16: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):204 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876:2876 -> a
+    17:17: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):204 -> a
+    18:21: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):207:210 -> a
+    22:26:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):218:222 -> a
+    27:31:void visitEnd():226:230 -> a
+    32:33: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():3446:3447 -> a
+    32:33:void visitEnd():230 -> a
+    34:34:void visitEnd():230:230 -> a
+    35:35:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    35:35: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():3448 -> a
+    35:35:void visitEnd():230 -> a
+    36:36: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():3448:3448 -> a
+    36:36:void visitEnd():230 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Jk:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):248:248 -> <init>
-    1:1:void visit(boolean):251:251 -> a
-    2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):256:256 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.ok:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):262:262 -> <init>
+    1:1:void visit(boolean):265:265 -> a
+    2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):270:270 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Kk:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):239:239 -> <init>
-    1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.uk:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):253:253 -> <init>
+    1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):255:255 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.Qk:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
     1:2:void <init>():61:62 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61:61 -> a
-    2:182:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):0:180 -> a
-    2:182:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
-    183:186:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):75:78 -> a
-    183:186:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
-    187:187:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):73:73 -> a
-    187:187:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
-    188:188:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):66:66 -> a
-    189:189:void visitModuleName(java.lang.String):69:69 -> a
+    2:197:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):0:195 -> a
+    2:197:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
+    198:317:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):75:194 -> a
+    198:317:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
+    318:319:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):77:78 -> a
+    318:319:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
+    320:320:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):73:73 -> a
+    320:320:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
+    321:321:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):66:66 -> a
+    322:322:void visitModuleName(java.lang.String):69:69 -> a
     1:1:java.util.List getLocalDelegatedProperties():62:62 -> c
     1:1:java.lang.String getModuleName():63:63 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.Sk:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
     int jvmFlags -> c
@@ -65631,36 +65999,52 @@
     1:1:int getJvmFlags():103:103 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():106:106 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():107:107 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeAliasExtension -> com.android.tools.r8.internal.ol:
+# {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
+    1:1:void <init>():180:180 -> <init>
+    1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):180:180 -> a
+    2:185:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeAliasExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor):0:183 -> a
+    2:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):180 -> a
+    186:186:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeAliasExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor):182:182 -> a
+    186:186:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):180 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.ql:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
     1:3:void <init>():160:162 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160:160 -> a
-    2:182:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor):0:180 -> a
-    2:182:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
-    183:184:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor):175:176 -> a
-    183:184:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
-    185:185:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor):173:173 -> a
-    185:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
-    186:186:void visit(boolean):165:165 -> a
-    187:187:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
+    2:196:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor):0:194 -> a
+    2:196:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
+    197:198:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor):175:176 -> a
+    197:198:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
+    199:199:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor):173:173 -> a
+    199:199:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
+    200:200:void visit(boolean):165:165 -> a
+    201:201:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
     1:1:java.util.List getAnnotations():162:162 -> b
     1:1:boolean isRaw():161:161 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Uk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.sl:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():146:147 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146:146 -> a
-    2:182:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor):0:180 -> a
-    2:182:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
-    183:184:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor):155:156 -> a
-    183:184:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
-    185:185:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor):154:154 -> a
-    185:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
-    186:186:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
+    2:196:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor):0:194 -> a
+    2:196:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
+    197:198:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor):155:156 -> a
+    197:198:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
+    199:199:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor):154:154 -> a
+    199:199:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
+    200:200:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
     1:1:java.util.List getAnnotations():147:147 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.Wk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmValueParameterExtension -> com.android.tools.r8.internal.ul:
+# {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
+    1:1:void <init>():187:187 -> <init>
+    1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):187:187 -> a
+    2:192:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmValueParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor):0:190 -> a
+    2:192:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):187 -> a
+    193:193:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmValueParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor):189:189 -> a
+    193:193:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):187 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.wl:
 # {"id":"sourceFile","fileName":"jvmWriteUtils.kt"}
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:16 -> a
     4:64:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):0:60 -> a
@@ -65674,41 +66058,40 @@
     72:72:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
     73:78:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:22 -> a
     79:86:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):15:22 -> a
-    87:87:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):21:21 -> a
-    88:88:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:14 -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.jm:
+    87:87:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:14 -> a
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Im:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.km:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.lm:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.mm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Jm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Km:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Lm:
     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.nm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Mm:
     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.om:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Nm:
     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.pm:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.qm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Om:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Pm:
     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.rm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Qm:
     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.sm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Rm:
     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.tm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.Sm:
     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.um:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.vm:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.wm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.Um:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.Vm:
     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.xm:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.zm:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.Ym:
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
     com.android.tools.r8.kotlin.Kotlin$_Assertions assertions -> e
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):38:43 -> <init>
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.zm$a:
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.zm$b:
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.Ym$a:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.Ym$b:
     com.android.tools.r8.graph.DexType lambdaType -> a
     com.android.tools.r8.kotlin.Kotlin this$0 -> b
     1:1:void <clinit>():46:46 -> <clinit>
@@ -65719,7 +66102,7 @@
     13:30:void <init>(com.android.tools.r8.kotlin.Kotlin):61:78 -> <init>
     31:31:void <init>(com.android.tools.r8.kotlin.Kotlin):76:76 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):64:64 -> a
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.zm$c:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.Ym$c:
     com.android.tools.r8.graph.DexMethod throwNpe -> c
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> b
     com.android.tools.r8.graph.DexMethod throwParameterIsNullException -> a
@@ -65727,7 +66110,7 @@
     5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):113:116 -> <init>
     9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):115:119 -> <init>
     14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):118:118 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.zm$d:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.Ym$d:
     com.android.tools.r8.graph.DexString kind -> a
     com.android.tools.r8.graph.DexString metadataVersion -> b
     com.android.tools.r8.graph.DexString bytecodeVersion -> c
@@ -65737,11 +66120,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):92:100 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.zm$e:
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.Ym$e:
     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):103:107 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.Fm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.en:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -65750,14 +66133,14 @@
     2:6:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
     7:7:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):55:55 -> a
     1:10:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36:45 -> b
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.Am:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.Zm:
     com.android.tools.r8.kotlin.KotlinAnnotationInfo value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):117:118 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):123:124 -> a
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo access$200(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):113 -> a
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):129:129 -> a
     4:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):134:137 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.Bm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.an:
     java.util.List value -> b
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> c
     1:2:void <clinit>():145:146 -> <clinit>
@@ -65766,14 +66149,14 @@
     1:8:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo access$300(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue,com.android.tools.r8.graph.DexItemFactory):143 -> a
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):167:168 -> a
     11:19:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):174:182 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.Cm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.bn:
     com.android.tools.r8.kotlin.KotlinTypeReference value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference):63:64 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):68:69 -> a
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):59 -> a
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):74:74 -> a
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):79:80 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.Dm:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.cn:
     java.lang.String enumEntryName -> c
     com.android.tools.r8.kotlin.KotlinTypeReference enumClassName -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String):89:91 -> <init>
@@ -65781,14 +66164,14 @@
     1:3:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):84 -> a
     4:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):102:102 -> a
     5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):107:108 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.Em:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.dn:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument argument -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):190:191 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):195:195 -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):186 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):205:205 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.fn:
     java.util.Map arguments -> b
     java.util.List EMPTY_ANNOTATIONS -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> a
@@ -65803,7 +66186,7 @@
     31:33:void lambda$rewrite$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.util.Map,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):65:67 -> a
     34:35:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):75:76 -> a
     36:36:void lambda$trace$1(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):76:76 -> a
-com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.Im:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.hn:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> k
     java.lang.String packageName -> m
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> n
@@ -65829,7 +66212,7 @@
     35:35:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):43:43 -> a
     35:35:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):193 -> a
     35:35:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
-    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     36:36:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44 -> a
     36:36:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):193 -> a
     36:36:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
@@ -65839,87 +66222,87 @@
     43:43: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):192:192 -> a
     43:43:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
     44:45:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):121:122 -> a
-    46:73:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:27 -> a
-    46:73:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):124 -> a
-    74:76:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):126:128 -> a
-    77:81:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSuperTypes(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):174:178 -> a
-    77:81:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):128 -> a
-    82:82:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):129:129 -> a
-    83:90:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSealedSubClasses(java.util.List,com.android.tools.r8.graph.DexItemFactory):162:169 -> a
-    83:90:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):129 -> a
-    91:91:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):130:130 -> a
-    92:98:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexItemFactory):151:157 -> a
-    92:98:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):130 -> a
-    99:100:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):131:132 -> a
-    101:138:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:37 -> a
-    101:138:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexItemFactory):142 -> a
-    101:138:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):133 -> a
-    139:139:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexItemFactory):144:144 -> a
-    139:139:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):133 -> a
-    140:161:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:21 -> a
-    140:161:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):136 -> a
-    162:162:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):135:135 -> a
-    163:175:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):208:220 -> a
-    176:220:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.setName(java.lang.String):0:44 -> a
-    176:220:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):217 -> a
-    221:226:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):222:227 -> a
-    227:229:void com.android.tools.r8.kotlin.KotlinCompanionInfo.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):27:29 -> a
-    227:229:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):227 -> a
-    230:275:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):231:276 -> a
-    276:299:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):275:298 -> a
-    300:300:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinConstructorInfo):313:313 -> a
-    301:310:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):313:322 -> a
-    311:311:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):315:315 -> a
-    312:312:java.util.function.Consumer lambda$trace$2(com.android.tools.r8.kotlin.KotlinTypeInfo):316:316 -> a
-    313:313:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinTypeReference):317:317 -> a
+    46:75:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:29 -> a
+    46:75:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):124 -> a
+    76:78:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):126:128 -> a
+    79:83:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSuperTypes(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):174:178 -> a
+    79:83:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):128 -> a
+    84:84:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):129:129 -> a
+    85:92:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSealedSubClasses(java.util.List,com.android.tools.r8.graph.DexItemFactory):162:169 -> a
+    85:92:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):129 -> a
+    93:93:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):130:130 -> a
+    94:100:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexItemFactory):151:157 -> a
+    94:100:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):130 -> a
+    101:102:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):131:132 -> a
+    103:142:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:39 -> a
+    103:142:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexItemFactory):142 -> a
+    103:142:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):133 -> a
+    143:143:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexItemFactory):144:144 -> a
+    143:143:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):133 -> a
+    144:167:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:23 -> a
+    144:167:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):136 -> a
+    168:168:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):135:135 -> a
+    169:181:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):208:220 -> a
+    182:226:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.setName(java.lang.String):0:44 -> a
+    182:226:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):217 -> a
+    227:232:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):222:227 -> a
+    233:235:void com.android.tools.r8.kotlin.KotlinCompanionInfo.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):27:29 -> a
+    233:235:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):227 -> a
+    236:281:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):231:276 -> a
+    282:305:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):275:298 -> a
+    306:306:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinConstructorInfo):313:313 -> a
+    307:316:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):313:322 -> a
+    317:317:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):315:315 -> a
+    318:318:java.util.function.Consumer lambda$trace$2(com.android.tools.r8.kotlin.KotlinTypeInfo):316:316 -> a
+    319:319:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinTypeReference):317:317 -> a
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinTypeReference):318:318 -> b
     1:1:java.lang.String getPackageName():303:303 -> j
     1:1:int[] getMetadataVersion():308:308 -> n
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.Jm:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.in:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> f
     java.lang.String getPackageName() -> j
     boolean isSyntheticClass() -> l
     int[] getMetadataVersion() -> n
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.Nm:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.mn:
     1:17:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):55:71 -> a
     18:24:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:72 -> a
     25:31:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):58:58 -> a
     37:37:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):64:64 -> a
     38:63:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):102:127 -> a
-    64:405:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0:341 -> a
-    64:405:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    64:405:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    406:419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):339:352 -> a
-    406:419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    406:419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    420:420:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):351:351 -> a
-    420:420:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    420:420:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    421:421:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):350:350 -> a
-    421:421:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    421:421:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    422:422:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):349:349 -> a
-    422:422:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    422:422:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    423:423:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):348:348 -> a
-    423:423:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    423:423:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    424:434:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):347:357 -> a
-    424:434:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    424:434:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    435:435:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):355:355 -> a
-    435:435:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    435:435:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
-    436:436:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):109:109 -> a
-    437:441:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):138:142 -> a
-    442:487:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):141:186 -> a
-    488:488:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):191:191 -> a
-    489:489:boolean com.android.tools.r8.graph.DexValue.isDexValueArray():0:0 -> a
-    489:489:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):191 -> a
-    490:494:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):194:198 -> a
-    495:495:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):192:192 -> a
+    64:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0:334 -> a
+    64:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    64:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    399:412:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):332:345 -> a
+    399:412:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    399:412:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    413:413:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):344:344 -> a
+    413:413:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    413:413:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    414:414:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):343:343 -> a
+    414:414:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    414:414:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    415:415:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):342:342 -> a
+    415:415:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    415:415:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    416:416:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):341:341 -> a
+    416:416:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    416:416:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    417:427:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):340:350 -> a
+    417:427:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    417:427:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    428:428:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):348:348 -> a
+    428:428:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    428:428:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):128 -> a
+    429:429:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):109:109 -> a
+    430:434:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):138:142 -> a
+    435:480:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):141:186 -> a
+    481:481:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):191:191 -> a
+    482:482:boolean com.android.tools.r8.graph.DexValue.isDexValueArray():0:0 -> a
+    482:482:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):191 -> a
+    483:487:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):194:198 -> a
+    488:488:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):192:192 -> a
     1:4:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):217:220 -> b
     5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):218:218 -> b
     1:1:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):204:204 -> c
@@ -65927,11 +66310,11 @@
     2:2:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):204 -> c
     3:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):207:211 -> c
     8:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):205:205 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.Nm$a:
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.Nm$b:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.mn$a:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.mn$b:
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassMetadataReader$1):223:223 -> <init>
     2:2:void <init>(java.lang.String):225:225 -> <init>
-com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.Um:
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.tn:
     1:1:void <init>():22:22 -> <init>
     void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens) -> a
@@ -65940,8 +66323,8 @@
     24:25:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
     24:25:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
     26:27:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46:47 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.Om:
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.Pm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.nn:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.on:
     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):57:57 -> <init>
@@ -65949,36 +66332,36 @@
     1:8:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69:76 -> a
     9:9:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
     10:10:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):87:87 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.Qm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.pn:
     java.lang.String typeAlias -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):110:110 -> <init>
     2:3:void <init>(java.lang.String):114:115 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):120:120 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.qn:
     int typeId -> a
     1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):91:91 -> <init>
     2:3:void <init>(int):95:96 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):101:101 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.Sm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.rn:
     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:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):138:138 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.sn:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):147:147 -> <init>
     2:3:void <init>(java.lang.String):150:151 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):156:156 -> a
-com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.Vm:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.un:
     1:1:void <init>():14:14 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     boolean isCompanion() -> d
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> e
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.vn:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -65989,16 +66372,16 @@
     9:9:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:0 -> a
     9:9:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):59 -> a
     10:35: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):0:25 -> a
-    10:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145 -> a
+    10:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):147 -> a
     10:35:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):59 -> a
-    36:36:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145:145 -> a
+    36:36:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):147:147 -> a
     36:36:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):59 -> a
     37:41:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):61:65 -> a
     42:42:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinValueParameterInfo):80:80 -> a
     43:45:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:82 -> a
     boolean isConstructor() -> g
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.Xm:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.wn:
     java.util.List effects -> a
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -66010,7 +66393,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):49:49 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:49 -> a
     19:26:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:63 -> a
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.Zm:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.yn:
     java.util.List functionsWithNoBacking -> b
     java.util.List typeAliases -> a
     java.util.List propertiesWithNoBacking -> c
@@ -66039,7 +66422,7 @@
     142:142:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):216:216 -> a
     1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):186:186 -> b
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):217:217 -> c
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.Ym:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.xn:
     com.android.tools.r8.graph.DexEncodedField backingField -> a
     com.android.tools.r8.graph.DexEncodedMethod getter -> c
     com.android.tools.r8.graph.DexEncodedMethod setter -> b
@@ -66052,7 +66435,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):220:220 -> b
     2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):237:238 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):220:220 -> c
-com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.an:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.zn:
     java.util.List orArguments -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> d
     java.util.List andArguments -> e
@@ -66069,7 +66452,7 @@
     26:26:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):84:84 -> a
     27:44:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:107 -> a
     1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):85:85 -> b
-com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.An:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -66078,12 +66461,12 @@
     1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):50:50 -> a
     2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
     4:9:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:60 -> a
-com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.Bn:
     com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> c
     boolean isCompanion() -> d
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> e
     boolean isFieldProperty() -> m
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.dn:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.Cn:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -66094,7 +66477,7 @@
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
     1:1:java.lang.String getPackageName():70:70 -> j
     1:1:int[] getMetadataVersion():75:75 -> n
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.en:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.Dn:
     java.lang.String typeFlexibilityId -> i
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> j
     boolean $assertionsDisabled -> k
@@ -66105,7 +66488,7 @@
     16:20:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69:73 -> a
     21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):73:73 -> a
     22:25:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):78:81 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.fn:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.En:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -66126,10 +66509,10 @@
     13:13:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinFunctionInfo.getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):102 -> a
     13:13:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):94 -> a
     14:33:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> a
-    14:33:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79 -> a
+    14:33:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):81 -> a
     14:33:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinFunctionInfo.getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):102 -> a
     14:33:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):94 -> a
-    34:34:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79:79 -> a
+    34:34:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):81:81 -> a
     34:34:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinFunctionInfo.getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):102 -> a
     34:34:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):94 -> a
     35:35:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinFunctionInfo.getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
@@ -66143,14 +66526,14 @@
     boolean isFunction() -> i
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSignature():166:166 -> o
     1:1:boolean hasCrossInlineParameter():72:72 -> p
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.gn:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.Fn:
     java.lang.String name -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference):24:26 -> <init>
     1:3:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):34:36 -> a
     4:14:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature rewrite(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:51 -> a
     15:15:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.hn:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Gn:
     java.util.List EMPTY_PARAMETERS_LIST -> e
     java.util.List parameters -> c
     boolean $assertionsDisabled -> f
@@ -66165,7 +66548,7 @@
     41:46:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):118:123 -> a
     47:47:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):123:123 -> a
     1:13:java.lang.String toString():101:113 -> toString
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.in:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Hn:
     boolean hasBacking -> b
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> a
     boolean $assertionsDisabled -> c
@@ -66177,7 +66560,7 @@
     30:36:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73 -> a
     37:41:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):72:76 -> a
     42:42:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.jn:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.In:
     java.util.List propertyInfos -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> b
     boolean $assertionsDisabled -> c
@@ -66188,9 +66571,9 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):52:52 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
     19:20:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57:58 -> a
-com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.kn:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.Jn:
     boolean isNoKotlinInformation() -> a
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.ln:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Kn:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -66198,7 +66581,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.on:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.Nn:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> c
@@ -66242,8 +66625,8 @@
     122:123:boolean com.android.tools.r8.kotlin.KotlinClassMetadataReader.hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):95:96 -> a
     122:123:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):127 -> a
     124:128:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):127:127 -> a
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.mn:
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.nn:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.Ln:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Mn:
     java.util.Set prunedTypes -> c
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
@@ -66252,7 +66635,7 @@
     2:5:void <init>(com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier,java.util.Set):144:147 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():163:163 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):155:158 -> c
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.rn:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Qn:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> b
@@ -66299,8 +66682,8 @@
     162:171:int[] getMaxVersion(int[],int[]):259:268 -> a
     1:14:void runForR8(java.util.concurrent.ExecutorService):88:101 -> b
     15:15:void runForR8(java.util.concurrent.ExecutorService):100:100 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.pn:
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.qn:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.On:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Pn:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -66313,7 +66696,7 @@
     2:10:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean):55:63 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo.rewriteAll():67:67 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo access$100():37 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.wn:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.Vn:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
     1:2:void <clinit>():33:34 -> <clinit>
@@ -66327,8 +66710,8 @@
     24:24:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
     24:24:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):179 -> a
     25:35:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):182:192 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.sn:
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.vn:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.Rn:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.Un:
     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
@@ -66343,17 +66726,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():130:130 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):91:91 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():134:134 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.un:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.Tn:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):100:100 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):103:106 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.tn:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.Sn:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():106:106 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):106:106 -> <init>
     1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):113:118 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.wn$a:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.Vn$a:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):36:36 -> <init>
     2:3:void <init>(java.lang.String):41:42 -> <init>
@@ -66363,15 +66746,15 @@
     1:1:java.lang.String getPackageName():57:57 -> j
     1:1:int[] getMetadataVersion():62:62 -> n
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.xn:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.Wn:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
     1:1:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):297 -> a
     2:18: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):0:16 -> a
-    2:18:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):52 -> a
+    2:18:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):54 -> a
     2:18:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):297 -> a
-    19:19:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):52:52 -> a
+    19:19:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):54:54 -> a
     19:19:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):297 -> a
     20:20:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):297:297 -> a
     21:21:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):293:293 -> a
@@ -66407,7 +66790,7 @@
     204:204:java.lang.String lambda$appendKmDeclarationContainer$9(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):227:227 -> a
     205:205:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):230:230 -> a
     206:219:java.lang.String lambda$appendKmDeclarationContainer$12(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):247:260 -> a
-    220:220:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():271:271 -> a
+    220:220:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():266:266 -> a
     220:220:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):126 -> a
     221:223:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):125:127 -> a
     224:224:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):280:280 -> a
@@ -66415,9 +66798,9 @@
     226:226:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
     226:226:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
     227:243: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):0:16 -> a
-    227:243:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):58 -> a
+    227:243:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):60 -> a
     227:243:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
-    244:244:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):58:58 -> a
+    244:244:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):60:60 -> a
     244:244:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
     245:246:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287:288 -> a
     247:272:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):305:330 -> a
@@ -66425,82 +66808,82 @@
     277:283:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):331:337 -> a
     284:290:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):333:339 -> a
     291:291:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):338:338 -> a
-    292:329:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:37 -> a
-    292:329:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):344 -> a
-    330:330:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):340:340 -> a
-    331:358:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:27 -> a
-    331:358:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):345 -> a
-    359:393:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):345:379 -> a
-    394:394:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):312:312 -> a
-    395:395:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):325:325 -> a
-    396:396:void lambda$appendKmClass$22(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):357:357 -> a
-    397:397:java.lang.String lambda$appendKmClass$24(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):373:373 -> a
-    398:398:void lambda$appendKmClass$25(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):376:376 -> a
-    399:399:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):384:384 -> a
-    400:400:void lambda$appendKmConstructor$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):395:395 -> a
-    401:401:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):404:404 -> a
-    402:402:void lambda$appendKmFunction$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):415:415 -> a
-    403:403:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):456:456 -> a
-    404:404:void lambda$appendKmProperty$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):467:467 -> a
-    405:408:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):517:520 -> a
-    409:409:void lambda$appendKmType$41(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):536:536 -> a
-    410:410:void lambda$appendKmType$41(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):532:532 -> a
-    411:411:void lambda$appendKmType$40(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):538:538 -> a
-    412:412:void lambda$appendKmType$42(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):545:545 -> a
-    413:413:void lambda$appendKmType$46(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):558:558 -> a
-    414:414:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):574:574 -> a
-    415:415:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):573:573 -> a
-    416:416:void lambda$appendKmType$47(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):590:590 -> a
-    417:417:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):598:598 -> a
-    418:418:void lambda$appendKmTypeProjection$50(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):608:608 -> a
-    419:419:void lambda$appendValueParameters$52(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):624:624 -> a
-    420:423:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):631:634 -> a
-    424:424:void lambda$appendValueParameter$53(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):646:646 -> a
-    425:425:void lambda$appendTypeParameters$56(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):666:666 -> a
-    426:426:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):672:672 -> a
-    427:427:void lambda$appendTypeParameter$58(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):690:690 -> a
-    428:428:void lambda$appendTypeParameter$58(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):686:686 -> a
-    429:429:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):713:713 -> a
-    430:430:void lambda$appendTypeAlias$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):727:727 -> a
-    431:431:void lambda$appendTypeAlias$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):723:723 -> a
-    432:432:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):761:761 -> a
-    433:434:void lambda$appendKmAnnotation$72(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):766:767 -> a
-    435:440:void lambda$appendKmAnnotation$71(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):772:777 -> a
-    441:441:void lambda$appendKmAnnotation$71(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):773:773 -> a
-    442:442:void lambda$appendKmAnnotation$70(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):779:779 -> a
-    443:443:void lambda$appendKmAnnotation$69(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):784:784 -> a
-    444:444:void lambda$appendKmAnnotation$68(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):789:789 -> a
-    445:456:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):799:810 -> a
-    457:457:void lambda$appendKmArgument$73(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):807:807 -> a
-    458:458:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):816:816 -> a
-    459:459:void lambda$appendKmVersionRequirement$76(java.lang.StringBuilder,java.util.List,java.lang.String):821:821 -> a
-    460:460:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):827:827 -> a
-    461:463:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):832:834 -> a
-    464:472:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):833:841 -> a
-    473:481:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):835:843 -> a
-    482:484:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):842:844 -> a
-    485:485:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():727:727 -> a
-    485:485:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):848 -> a
-    486:486:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):848:848 -> a
-    487:487:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):844:844 -> a
-    488:488:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():727:727 -> a
-    488:488:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):848 -> a
-    489:489:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract):855:855 -> a
-    490:490:void lambda$appendKmContract$78(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):869:869 -> a
-    491:491:void lambda$appendKmContract$78(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):865:865 -> a
-    492:492:void lambda$appendKmContract$77(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):870:870 -> a
-    493:493:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):875:875 -> a
-    494:494:void lambda$appendKmEffect$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):895:895 -> a
-    495:495:void lambda$appendKmEffect$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):891:891 -> a
-    496:496:void lambda$appendKmEffect$80(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):897:897 -> a
-    497:497:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):908:908 -> a
-    498:498:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):915:915 -> a
+    292:331:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:39 -> a
+    292:331:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):344 -> a
+    332:332:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):340:340 -> a
+    333:362:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:29 -> a
+    333:362:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):345 -> a
+    363:397:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):345:379 -> a
+    398:398:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):312:312 -> a
+    399:399:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):325:325 -> a
+    400:400:void lambda$appendKmClass$22(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):357:357 -> a
+    401:401:java.lang.String lambda$appendKmClass$24(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):373:373 -> a
+    402:402:void lambda$appendKmClass$25(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):376:376 -> a
+    403:403:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):384:384 -> a
+    404:404:void lambda$appendKmConstructor$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):395:395 -> a
+    405:405:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):404:404 -> a
+    406:406:void lambda$appendKmFunction$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):415:415 -> a
+    407:407:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):456:456 -> a
+    408:408:void lambda$appendKmProperty$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):467:467 -> a
+    409:412:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):517:520 -> a
+    413:413:void lambda$appendKmType$41(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):536:536 -> a
+    414:414:void lambda$appendKmType$41(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):532:532 -> a
+    415:415:void lambda$appendKmType$40(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):538:538 -> a
+    416:416:void lambda$appendKmType$42(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):545:545 -> a
+    417:417:void lambda$appendKmType$46(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):558:558 -> a
+    418:418:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):574:574 -> a
+    419:419:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):573:573 -> a
+    420:420:void lambda$appendKmType$47(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):590:590 -> a
+    421:421:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):598:598 -> a
+    422:422:void lambda$appendKmTypeProjection$50(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):608:608 -> a
+    423:423:void lambda$appendValueParameters$52(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):624:624 -> a
+    424:427:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):631:634 -> a
+    428:428:void lambda$appendValueParameter$53(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):646:646 -> a
+    429:429:void lambda$appendTypeParameters$56(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):666:666 -> a
+    430:430:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):672:672 -> a
+    431:431:void lambda$appendTypeParameter$58(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):690:690 -> a
+    432:432:void lambda$appendTypeParameter$58(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):686:686 -> a
+    433:433:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):713:713 -> a
+    434:434:void lambda$appendTypeAlias$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):727:727 -> a
+    435:435:void lambda$appendTypeAlias$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):723:723 -> a
+    436:436:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):761:761 -> a
+    437:438:void lambda$appendKmAnnotation$72(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):766:767 -> a
+    439:444:void lambda$appendKmAnnotation$71(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):772:777 -> a
+    445:445:void lambda$appendKmAnnotation$71(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):773:773 -> a
+    446:446:void lambda$appendKmAnnotation$70(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):779:779 -> a
+    447:447:void lambda$appendKmAnnotation$69(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):784:784 -> a
+    448:448:void lambda$appendKmAnnotation$68(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):789:789 -> a
+    449:460:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):799:810 -> a
+    461:461:void lambda$appendKmArgument$73(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):807:807 -> a
+    462:462:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):816:816 -> a
+    463:463:void lambda$appendKmVersionRequirement$76(java.lang.StringBuilder,java.util.List,java.lang.String):821:821 -> a
+    464:464:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):827:827 -> a
+    465:467:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):832:834 -> a
+    468:476:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):833:841 -> a
+    477:485:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):835:843 -> a
+    486:488:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):842:844 -> a
+    489:489:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():781:781 -> a
+    489:489:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):848 -> a
+    490:490:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):848:848 -> a
+    491:491:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):844:844 -> a
+    492:492:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():781:781 -> a
+    492:492:void lambda$appendKmVersionRequirement$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):848 -> a
+    493:493:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract):855:855 -> a
+    494:494:void lambda$appendKmContract$78(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):869:869 -> a
+    495:495:void lambda$appendKmContract$78(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):865:865 -> a
+    496:496:void lambda$appendKmContract$77(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):870:870 -> a
+    497:497:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):875:875 -> a
+    498:498:void lambda$appendKmEffect$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):895:895 -> a
+    499:499:void lambda$appendKmEffect$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):891:891 -> a
+    500:500:void lambda$appendKmEffect$80(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):897:897 -> a
+    501:501:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):908:908 -> a
+    502:502:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):915:915 -> a
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:0 -> b
     1:1:void lambda$appendTypeParameter$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):704 -> b
     2:30:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:28 -> b
-    2:30:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152 -> b
+    2:30:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):154 -> b
     2:30:void lambda$appendTypeParameter$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):704 -> b
-    31:31:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152:152 -> b
+    31:31:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):154:154 -> b
     31:31:void lambda$appendTypeParameter$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):704 -> b
     32:32:void lambda$appendTypeParameter$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):704:704 -> b
     33:33:void lambda$appendTypeParameter$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):700:700 -> b
@@ -66534,25 +66917,25 @@
     113:136:void lambda$appendKmEffect$83(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):881:904 -> b
     137:137:void lambda$appendKmEffectExpression$84(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):940:940 -> b
     138:138:void lambda$appendKmEffectExpression$85(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):953:953 -> b
-    1:22:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:21 -> c
-    1:22:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):355 -> c
-    23:23:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):355:355 -> c
-    24:24:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):351:351 -> c
-    25:27:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):276:278 -> c
-    28:28:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):272:272 -> c
-    29:29:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):299:299 -> c
-    30:30:void lambda$appendKmFunction$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):425:425 -> c
-    31:31:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):441:441 -> c
-    32:32:void lambda$appendKmProperty$37(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):477:477 -> c
-    33:87:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):525:579 -> c
-    88:88:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):618:618 -> c
-    89:98:void lambda$appendValueParameter$55(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):639:648 -> c
-    99:117:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):677:695 -> c
-    118:118:void lambda$appendTypeParameter$59(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):706:706 -> c
-    119:119:void lambda$appendTypeAlias$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):746:746 -> c
-    120:120:void lambda$appendKmEffectExpression$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):951:951 -> c
-    121:121:void lambda$appendKmEffectExpression$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):947:947 -> c
-    122:122:void lambda$appendKmEffectExpression$87(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):967:967 -> c
+    1:24:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:23 -> c
+    1:24:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):355 -> c
+    25:25:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):355:355 -> c
+    26:26:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):351:351 -> c
+    27:29:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):276:278 -> c
+    30:30:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):272:272 -> c
+    31:31:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):299:299 -> c
+    32:32:void lambda$appendKmFunction$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):425:425 -> c
+    33:33:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):441:441 -> c
+    34:34:void lambda$appendKmProperty$37(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):477:477 -> c
+    35:89:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):525:579 -> c
+    90:90:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):618:618 -> c
+    91:100:void lambda$appendValueParameter$55(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):639:648 -> c
+    101:119:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):677:695 -> c
+    120:120:void lambda$appendTypeParameter$59(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):706:706 -> c
+    121:121:void lambda$appendTypeAlias$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):746:746 -> c
+    122:122:void lambda$appendKmEffectExpression$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):951:951 -> c
+    123:123:void lambda$appendKmEffectExpression$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):947:947 -> c
+    124:124:void lambda$appendKmEffectExpression$87(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):967:967 -> c
     1:3:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):370:372 -> d
     4:7:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):371:374 -> d
     8:8:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):366:366 -> d
@@ -66566,77 +66949,77 @@
     40:40:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:0 -> e
     40:40:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):451 -> e
     41:60:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> e
-    41:60:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79 -> e
+    41:60:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):81 -> e
     41:60:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):451 -> e
-    61:61:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79:79 -> e
+    61:61:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):81:81 -> e
     61:61:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):451 -> e
     62:62:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):447:447 -> e
     63:88:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):461:486 -> e
-    89:177:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:88 -> e
-    89:177:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):486 -> e
-    178:184:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):486:492 -> e
-    185:195:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):488:498 -> e
-    196:206:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):494:504 -> e
-    207:207:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):500:500 -> e
-    208:340:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:132 -> e
-    208:340:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):506 -> e
-    341:346:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):507:507 -> e
-    347:384:void lambda$appendTypeAlias$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):718:755 -> e
-    385:392:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):920:927 -> e
-    393:406:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):921:934 -> e
-    407:435:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):928:956 -> e
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.yn:
+    89:179:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:90 -> e
+    89:179:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):486 -> e
+    180:186:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):486:492 -> e
+    187:197:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):488:498 -> e
+    198:208:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):494:504 -> e
+    209:209:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):500:500 -> e
+    210:344:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:134 -> e
+    210:344:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):506 -> e
+    345:350:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):507:507 -> e
+    351:388:void lambda$appendTypeAlias$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):718:755 -> e
+    389:396:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):920:927 -> e
+    397:410:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):921:934 -> e
+    411:439:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):928:956 -> e
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.Xn:
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isConstructor() -> g
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
     boolean isFunction() -> i
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> k
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.zn:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.Yn:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
     1:4:void <init>(java.util.List,java.lang.String,int[]):29:32 -> <init>
     1:5:com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String,int[],com.android.tools.r8.graph.DexItemFactory):40:44 -> a
     6:10:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):61:65 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):241:242 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
-    13:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):0:364 -> a
-    13:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
-    13:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    13:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
-    378:378:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):247:247 -> a
-    378:378:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
-    378:378:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    378:378:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
-    379:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):245:249 -> a
-    379:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
-    379:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    379:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
-    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68:68 -> a
-    385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):364:364 -> a
-    385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
-    385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
-    386:386:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):83:83 -> a
-    387:387:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int,int,java.lang.Object):236:236 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
+    12:376:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int):0:364 -> a
+    12:376:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int,int,java.lang.Object):237 -> a
+    12:376:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
+    12:376:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
+    377:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int):242:242 -> a
+    377:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int,int,java.lang.Object):237 -> a
+    377:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
+    377:377:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
+    378:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int):240:244 -> a
+    378:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int,int,java.lang.Object):237 -> a
+    378:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
+    378:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
+    383:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68:68 -> a
+    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int):364:364 -> a
+    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int,int,java.lang.Object):237 -> a
+    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
+    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
+    385:385:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):83:83 -> a
+    386:386:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
     1:1:java.lang.String getPackageName():73:73 -> j
     1:1:int[] getMetadataVersion():78:78 -> n
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.An:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.Zn:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
     java.lang.String packageName -> c
     1:5:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinPackageInfo,java.lang.String,int[]):33:37 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):48:48 -> a
-    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():271:271 -> a
+    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():266:266 -> a
     2:2:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):49 -> a
     3:3:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):50:50 -> a
     4:9:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):67:72 -> a
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):87:87 -> a
     1:1:java.lang.String getPackageName():77:77 -> j
     1:1:int[] getMetadataVersion():82:82 -> n
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.ao:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     java.lang.String moduleName -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> c
@@ -66648,22 +67031,22 @@
     12:12:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
     12:12:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):57 -> a
     13:29: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):0:16 -> a
-    13:29:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):58 -> a
+    13:29:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):60 -> a
     13:29:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):57 -> a
-    30:30:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):58:58 -> a
+    30:30:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):60:60 -> a
     30:30:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):57 -> a
     31:31:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):58:58 -> a
     32:32:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
     32:32:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):61 -> a
     33:49: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):0:16 -> a
-    33:49:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):52 -> a
+    33:49:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):54 -> a
     33:49:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):61 -> a
-    50:50:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):52:52 -> a
+    50:50:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):54:54 -> a
     50:50:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):61 -> a
     51:51:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):60:60 -> a
     52:64:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):66:78 -> a
     65:66:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:84 -> a
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.Dn:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.bo:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
     int jvmFlags -> j
@@ -66680,107 +67063,109 @@
     java.lang.String name -> d
     1:15:void <init>(int,int,int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinValueParameterInfo,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,int,com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo):72:86 -> <init>
     1:10:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91:100 -> a
-    11:99:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:88 -> a
-    11:99:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):101 -> a
-    100:102:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102:104 -> a
-    103:106:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter) -> a
-    107:107:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105:105 -> a
-    108:240:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:132 -> a
-    108:240:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):108 -> a
-    241:241:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):107:107 -> a
-    242:264:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):151:173 -> a
-    265:272:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):169:176 -> a
-    273:273:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):175:175 -> a
-    274:280:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):183:189 -> a
-    281:283:void com.android.tools.r8.kotlin.KotlinValueParameterInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:85 -> a
-    281:283:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
-    284:295:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):192:203 -> a
-    296:296:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):192:192 -> a
+    11:101:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:90 -> a
+    11:101:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):101 -> a
+    102:104:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter) -> a
+    105:108:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):103:106 -> a
+    109:109:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105:105 -> a
+    110:244:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:134 -> a
+    110:244:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):108 -> a
+    245:245:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):107:107 -> a
+    246:268:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):151:173 -> a
+    269:276:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):169:176 -> a
+    277:277:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):175:175 -> a
+    278:284:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):183:189 -> a
+    285:287:void com.android.tools.r8.kotlin.KotlinValueParameterInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:85 -> a
+    285:287:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    288:299:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):192:203 -> a
+    300:300:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):192:192 -> a
     com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> c
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> k
     boolean isFieldProperty() -> m
     1:1:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo getFieldSignature():132:132 -> o
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getGetterSignature():136:136 -> p
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSetterSignature():140:140 -> q
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.co:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:23:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):113:135 -> a
-    24:24:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):53:53 -> a
-    24:24:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):135 -> a
-    25:25:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):169:169 -> a
-    26:57:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):138:169 -> a
-    58:78:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):143:163 -> a
-    79:79:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder.build():273:273 -> a
-    79:79:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):168 -> a
-    80:80:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):169:169 -> a
-    81:81:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):164:164 -> a
-    82:82:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):152:152 -> a
-    83:120:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):132:169 -> a
-    121:121:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148:148 -> a
-    122:136:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):178:192 -> a
-    122:136:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
-    137:137:int com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.asInteger(java.lang.String):205:205 -> a
-    137:137:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):192 -> a
-    137:137:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
-    138:141:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):193:196 -> a
-    138:141:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
-    142:142:int com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.asInteger(java.lang.String):207:207 -> a
-    142:142:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):192 -> a
-    142:142:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
-    143:143:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):189:189 -> a
-    143:143:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
-    144:144:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):185:185 -> a
-    144:144:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
-    145:145:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):180:180 -> a
-    145:145:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
-    1:1:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160:160 -> b
-    2:26:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):220:244 -> b
-    2:26:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
-    27:34:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):239:246 -> b
-    27:34:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.Fn$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.Fn$b:
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157:157 -> a
+    2:16:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):189:203 -> a
+    2:16:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157 -> a
+    17:17:int com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.asInteger(java.lang.String):216:216 -> a
+    17:17:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):203 -> a
+    17:17:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157 -> a
+    18:21:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):204:207 -> a
+    18:21:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157 -> a
+    22:22:int com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.asInteger(java.lang.String):218:218 -> a
+    22:22:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):203 -> a
+    22:22:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157 -> a
+    23:23:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):200:200 -> a
+    23:23:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157 -> a
+    24:24:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):196:196 -> a
+    24:24:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157 -> a
+    25:25:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):191:191 -> a
+    25:25:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):157 -> a
+    26:26:boolean lambda$parse$1(java.lang.String):169:169 -> a
+    1:23:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):122:144 -> b
+    24:24:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):54:54 -> b
+    24:24:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):144 -> b
+    25:25:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):180:180 -> b
+    26:59:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):147:180 -> b
+    60:83:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):152:175 -> b
+    84:84:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder.build():284:284 -> b
+    84:84:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):179 -> b
+    85:85:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):180:180 -> b
+    86:86:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):161:161 -> b
+    87:126:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):141:180 -> b
+    127:127:void lambda$parse$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):171:171 -> b
+    128:152:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):231:255 -> b
+    128:152:void lambda$parse$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):171 -> b
+    153:160:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):250:257 -> b
+    153:160:void lambda$parse$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):171 -> b
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.co$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.co$b:
     java.io.BufferedReader reader -> a
     java.lang.String readLine -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:2:void <init>(java.lang.String):44:45 -> <init>
-    1:1:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):53:53 -> a
-    1:1:void readExpectedLineOrThrow(java.lang.String):58 -> a
-    2:2:void readExpectedLineOrThrow(java.lang.String):59:59 -> a
-    3:3:boolean isEOF():65:65 -> a
-    4:22:void readUntil(java.lang.String,int,com.android.tools.r8.utils.ThrowingConsumer):83:101 -> a
-    1:1:java.lang.String readNextLine():49:49 -> b
-    2:3:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):69:70 -> b
-    1:1:void close():108:108 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.Fn$c:
-    1:1:void <init>(java.lang.String):34:34 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.Fn$d:
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:2:void <init>(java.lang.String):45:46 -> <init>
+    1:1:java.lang.String access$000(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader):39:39 -> a
+    2:2:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):54:54 -> a
+    2:2:void readExpectedLineOrThrow(java.lang.String):59 -> a
+    3:3:void readExpectedLineOrThrow(java.lang.String):60:60 -> a
+    4:4:boolean isEOF():66:66 -> a
+    5:5:void readUntil(java.lang.String,int,com.android.tools.r8.utils.ThrowingConsumer):84:84 -> a
+    6:24:void readUntil(java.util.function.Predicate,int,com.android.tools.r8.utils.ThrowingConsumer):92:110 -> a
+    1:1:java.lang.String readNextLine():50:50 -> b
+    2:3:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):70:71 -> b
+    1:1:void close():117:117 -> close
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.co$c:
+    1:1:void <init>(java.lang.String):35:35 -> <init>
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.co$d:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
-    1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):304:306 -> <init>
-    1:1:com.android.tools.r8.naming.Range getRange():314:314 -> a
-    1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():310:310 -> b
-    1:10:java.lang.String toString():319:328 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.Fn$e:
+    1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):315:317 -> <init>
+    1:1:com.android.tools.r8.naming.Range getRange():325:325 -> a
+    1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():321:321 -> b
+    1:10:java.lang.String toString():330:339 -> toString
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.co$e:
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
-    1:2:void <init>(com.android.tools.r8.utils.SegmentTree):254:255 -> <init>
-    1:1:java.util.Map$Entry lookup(int):259:259 -> a
-    2:2:int size():263:263 -> a
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.internal.Fn$f:
+    1:2:void <init>(com.android.tools.r8.utils.SegmentTree):265:266 -> <init>
+    1:1:java.util.Map$Entry lookup(int):270:270 -> a
+    2:2:int size():274:274 -> a
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.internal.co$f:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
-    1:4:void <init>():267:270 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.Fn$g:
+    1:4:void <init>():278:281 -> <init>
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.co$g:
     java.lang.String fileName -> a
     java.lang.String path -> b
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):277:277 -> <init>
-    2:4:void <init>(java.lang.String,java.lang.String):281:283 -> <init>
-    1:1:java.lang.String getFileName():287:287 -> a
-    1:1:java.lang.String getPath():291:291 -> b
-    1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.Gn:
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):288:288 -> <init>
+    2:4:void <init>(java.lang.String,java.lang.String):292:294 -> <init>
+    1:1:java.lang.String getFileName():298:298 -> a
+    1:1:java.lang.String getPath():302:302 -> b
+    1:1:java.lang.String toString():307:307 -> toString
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.do:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> d
     int[] metadataVersion -> c
@@ -66791,25 +67176,25 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda) -> a
     1:7:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51:57 -> a
     8:11:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):86:89 -> a
-    12:251:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):0:239 -> a
-    12:251:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
-    252:252:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):238:238 -> a
-    252:252:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
-    253:253:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):93:93 -> a
-    254:255:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):98:99 -> a
-    256:269:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour getFlavour(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):119:132 -> a
+    12:291:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):0:279 -> a
+    12:291:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
+    292:292:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):278:278 -> a
+    292:292:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
+    293:293:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):93:93 -> a
+    294:295:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):98:99 -> a
+    296:309:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour getFlavour(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):119:132 -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> f
     1:1:java.lang.String getPackageName():105:105 -> j
     boolean isSyntheticClass() -> l
     1:1:int[] getMetadataVersion():110:110 -> n
     1:1:boolean isLambda():63:63 -> o
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.internal.Gn$a:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.internal.do$a:
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour KotlinStyleLambda -> a
     1:3:void <clinit>():27:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.Hn:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.eo:
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> d
     java.util.List typeParameters -> e
@@ -66825,7 +67210,7 @@
     19:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:82 -> a
     23:23:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):81:81 -> a
     24:24:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):82:82 -> a
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.In:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.fo:
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> g
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> d
@@ -66844,7 +67229,7 @@
     50:50:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):121:121 -> a
     51:51:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):123:123 -> a
     52:52:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):127:127 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.Jn:
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.go:
     java.util.List annotations -> f
     java.util.List originalUpperBounds -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> d
@@ -66865,10 +67250,10 @@
     20:20:com.android.tools.r8.kotlin.KotlinTypeParameterInfo com.android.tools.r8.kotlin.KotlinTypeParameterInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
     20:20:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
     21:49:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:28 -> a
-    21:49:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152 -> a
+    21:49:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):154 -> a
     21:49:com.android.tools.r8.kotlin.KotlinTypeParameterInfo com.android.tools.r8.kotlin.KotlinTypeParameterInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
     21:49:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    50:50:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152:152 -> a
+    50:50:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):154:154 -> a
     50:50:com.android.tools.r8.kotlin.KotlinTypeParameterInfo com.android.tools.r8.kotlin.KotlinTypeParameterInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
     50:50:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
     51:51:com.android.tools.r8.kotlin.KotlinTypeParameterInfo com.android.tools.r8.kotlin.KotlinTypeParameterInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60:60 -> a
@@ -66878,7 +67263,7 @@
     67:67:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):108:108 -> a
     68:69:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):108:109 -> a
     70:70:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):109:109 -> a
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.ho:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo typeInfo -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):22:24 -> <init>
@@ -66888,7 +67273,7 @@
     5:7:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:46 -> a
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):46:46 -> a
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:53 -> a
-com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.Ln:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.io:
     com.android.tools.r8.graph.DexType known -> a
     java.lang.String unknown -> b
     boolean $assertionsDisabled -> c
@@ -66912,7 +67297,7 @@
     1:5:com.android.tools.r8.kotlin.KotlinTypeReference fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):51 -> b
     6:14:java.lang.String toRenamedDescriptorOrDefault(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.lang.String):65:73 -> b
     1:1:java.lang.String toString():114:114 -> toString
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.Mn:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.jo:
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> d
     java.util.List EMPTY_VALUE_PARAMETERS -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> c
@@ -66924,14 +67309,14 @@
     7:14:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:66 -> a
     15:18:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73:76 -> a
     19:21:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:85 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.On:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.lo:
     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:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider):38:42 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.Nn:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.ko:
     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
@@ -66942,7 +67327,7 @@
     1:5:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):46 -> a
     6:8:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):77:79 -> a
     6:8:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):46 -> a
-com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.tp:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.Qp:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -66959,115 +67344,94 @@
     1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingClass(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):32:33 -> a
     1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingMember(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39:40 -> b
 com.android.tools.r8.naming.ClassNameMapper -> com.android.tools.r8.naming.b:
-    java.util.Map signatureMap -> d
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.utils.BiMapContainer nameMapping -> c
-    com.android.tools.r8.com.google.common.collect.ImmutableMap additionalMappingInfo -> b
+    java.util.Map signatureMap -> c
+    com.android.tools.r8.utils.BiMapContainer nameMapping -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.naming.ClassNameMapper$1):44:44 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap):176:176 -> <init>
-    3:9:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap):172:178 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():114:114 -> a
-    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):118:118 -> a
-    3:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):123:129 -> a
-    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):151:151 -> a
-    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):129 -> a
-    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
-    12:13:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():113:114 -> a
-    12:13:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):139 -> a
-    14:14:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):151:151 -> a
-    14:14:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):138 -> a
-    15:24:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):157:157 -> a
-    32:32:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):165:165 -> a
-    33:33:java.util.List getAdditionalMappingInfo(com.android.tools.r8.naming.mappinginformation.ScopeReference):186:186 -> a
-    34:34:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):666:666 -> a
-    34:34:java.util.List getAdditionalMappingInfo(com.android.tools.r8.naming.mappinginformation.ScopeReference):186 -> a
-    35:35:java.util.List getAdditionalMappingInfo(com.android.tools.r8.naming.mappinginformation.ScopeReference):186:186 -> a
-    36:39:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):199:202 -> a
-    40:40:java.lang.String deobfuscateType(java.lang.String):231:231 -> a
-    40:40:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):202 -> a
-    41:43:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):202:204 -> a
-    44:44:java.lang.String deobfuscateType(java.lang.String):231:231 -> a
-    44:44:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):204 -> a
-    45:45:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):206:206 -> a
-    46:50:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):190:194 -> a
-    46:50:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):208 -> a
-    51:51:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):208:208 -> a
-    52:52:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):212:212 -> a
-    53:53:java.lang.String deobfuscateType(java.lang.String):231:231 -> a
-    53:53:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):212 -> a
-    54:54:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):213:213 -> a
-    55:59:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):190:194 -> a
-    55:59:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):213 -> a
-    60:60:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):213:213 -> a
-    61:65:java.lang.String deobfuscateClassName(java.lang.String):223:227 -> a
-    66:66:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):256:256 -> a
-    67:67:void write(com.android.tools.r8.utils.ChainableStringConsumer):278:278 -> a
-    68:68:java.util.Map getClassNameMappings():182:182 -> a
-    68:68:boolean verifyIsSorted():263 -> a
-    68:68:void write(com.android.tools.r8.utils.ChainableStringConsumer):278 -> a
-    69:71:boolean verifyIsSorted():263:265 -> a
-    69:71:void write(com.android.tools.r8.utils.ChainableStringConsumer):278 -> a
-    72:72:java.util.Map getClassNameMappings():182:182 -> a
-    72:72:boolean verifyIsSorted():265 -> a
-    72:72:void write(com.android.tools.r8.utils.ChainableStringConsumer):278 -> a
-    73:78:boolean verifyIsSorted():265:270 -> a
-    73:78:void write(com.android.tools.r8.utils.ChainableStringConsumer):278 -> a
-    79:79:java.util.Map getClassNameMappings():182:182 -> a
-    79:79:void write(com.android.tools.r8.utils.ChainableStringConsumer):279 -> a
-    80:83:void write(com.android.tools.r8.utils.ChainableStringConsumer):279:282 -> a
-    84:86:void write(com.android.tools.r8.utils.ChainableStringConsumer):281:283 -> a
-    87:94:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):318:325 -> a
-    95:104:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):330:339 -> a
-    105:105:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):371:371 -> a
-    106:106:java.lang.String deobfuscateType(java.lang.String):231:231 -> a
-    106:106:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):371 -> a
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):247:247 -> b
-    2:2:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():295:295 -> b
+    int $r8$clinit -> e
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.naming.ClassNameMapper$1):36:36 -> <init>
+    2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):142:142 -> <init>
+    3:6:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):140:143 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():74:74 -> a
+    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):78:78 -> a
+    3:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):83:89 -> a
+    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):99:99 -> a
+    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):98:98 -> a
+    12:12:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):117:117 -> a
+    13:23:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):126:126 -> a
+    32:32:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):135:135 -> a
+    33:36:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):160:163 -> a
+    37:37:java.lang.String deobfuscateType(java.lang.String):192:192 -> a
+    37:37:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):163 -> a
+    38:40:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):163:165 -> a
+    41:41:java.lang.String deobfuscateType(java.lang.String):192:192 -> a
+    41:41:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):165 -> a
+    42:42:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):167:167 -> a
+    43:47:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):151:155 -> a
+    43:47:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):169 -> a
+    48:48:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):169:169 -> a
+    49:49:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):173:173 -> a
+    50:50:java.lang.String deobfuscateType(java.lang.String):192:192 -> a
+    50:50:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):173 -> a
+    51:51:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):174:174 -> a
+    52:56:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):151:155 -> a
+    52:56:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):174 -> a
+    57:57:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):174:174 -> a
+    58:62:java.lang.String deobfuscateClassName(java.lang.String):184:188 -> a
+    63:63:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):217:217 -> a
+    64:64:void write(com.android.tools.r8.utils.ChainableStringConsumer):239:239 -> a
+    65:65:java.util.Map getClassNameMappings():147:147 -> a
+    65:65:boolean verifyIsSorted():224 -> a
+    65:65:void write(com.android.tools.r8.utils.ChainableStringConsumer):239 -> a
+    66:68:boolean verifyIsSorted():224:226 -> a
+    66:68:void write(com.android.tools.r8.utils.ChainableStringConsumer):239 -> a
+    69:69:java.util.Map getClassNameMappings():147:147 -> a
+    69:69:boolean verifyIsSorted():226 -> a
+    69:69:void write(com.android.tools.r8.utils.ChainableStringConsumer):239 -> a
+    70:75:boolean verifyIsSorted():226:231 -> a
+    70:75:void write(com.android.tools.r8.utils.ChainableStringConsumer):239 -> a
+    76:76:java.util.Map getClassNameMappings():147:147 -> a
+    76:76:void write(com.android.tools.r8.utils.ChainableStringConsumer):240 -> a
+    77:78:void write(com.android.tools.r8.utils.ChainableStringConsumer):240:241 -> a
+    79:86:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):276:283 -> a
+    87:96:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):288:297 -> a
+    97:97:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):329:329 -> a
+    98:98:java.lang.String deobfuscateType(java.lang.String):192:192 -> a
+    98:98:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):329 -> a
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):208:208 -> b
+    2:2:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():253:253 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap.builder():122:122 -> b
-    3:3:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():296 -> b
-    4:10:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():297:303 -> b
-    11:21:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):343:353 -> b
-    22:32:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):357:367 -> b
-    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):133:133 -> c
-    2:3:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():113:114 -> c
-    2:3:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):133 -> c
-    4:4:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):151:151 -> c
-    4:4:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):133 -> c
-    5:5:boolean isEmpty():251:251 -> c
-    1:4:com.android.tools.r8.naming.ClassNameMapper sorted():255:258 -> d
-    1:2:boolean equals(java.lang.Object):308:309 -> equals
-    1:1:int hashCode():314:314 -> hashCode
-    1:3:java.lang.String toString():289:291 -> toString
+    3:3:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():254 -> b
+    4:10:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():255:261 -> b
+    11:21:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):301:311 -> b
+    22:32:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):315:325 -> b
+    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):93:93 -> c
+    2:2:boolean isEmpty():212:212 -> c
+    1:4:com.android.tools.r8.naming.ClassNameMapper sorted():216:219 -> d
+    1:2:boolean equals(java.lang.Object):266:267 -> equals
+    1:1:int hashCode():272:272 -> hashCode
+    1:3:java.lang.String toString():247:249 -> toString
 com.android.tools.r8.naming.ClassNameMapper$1 -> com.android.tools.r8.naming.b$a:
 com.android.tools.r8.naming.ClassNameMapper$Builder -> com.android.tools.r8.naming.b$b:
     java.util.Map mapping -> a
-    java.util.Map scopedMappingInfo -> b
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper$1):51:51 -> <init>
-    2:2:void <init>():55:55 -> <init>
-    3:4:void <init>():52:53 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:51 -> a
-    2:9:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):73:80 -> a
-    10:10:com.android.tools.r8.naming.ClassNameMapper build():85:85 -> a
-    11:11:void lambda$buildScopedMappingInfo$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.List):92:92 -> a
-    12:12:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder lambda$buildClassNameMappings$1(java.lang.String):102:102 -> a
-    13:13:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder com.android.tools.r8.naming.ClassNamingForNameMapper.builder(java.lang.String,java.lang.String):183:183 -> a
-    13:13:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder lambda$buildClassNameMappings$1(java.lang.String):102 -> a
-    14:14:java.lang.String lambda$buildClassNameMappings$2(com.android.tools.r8.naming.ClassNamingForNameMapper):106:106 -> a
-    15:15:void lambda$buildClassNameMappings$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):108:108 -> a
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):63:63 -> b
-    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder com.android.tools.r8.naming.ClassNamingForNameMapper.builder(java.lang.String,java.lang.String):183:183 -> b
-    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):63 -> b
-    3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):64:64 -> b
-    4:7:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():98:101 -> b
-    8:17:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():100:109 -> b
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableMap buildScopedMappingInfo():91:93 -> c
+    1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper$1):43:43 -> <init>
+    2:2:void <init>():46:46 -> <init>
+    3:3:void <init>():44:44 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):43:43 -> a
+    2:2:com.android.tools.r8.naming.ClassNameMapper build():61:61 -> a
+    3:3:java.lang.String lambda$buildClassNameMappings$0(com.android.tools.r8.naming.ClassNamingForNameMapper):66:66 -> a
+    4:4:void lambda$buildClassNameMappings$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):68:68 -> a
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):54:54 -> b
+    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder com.android.tools.r8.naming.ClassNamingForNameMapper.builder(java.lang.String,java.lang.String):204:204 -> b
+    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):54 -> b
+    3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):55:55 -> b
+    4:8:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():65:69 -> b
 com.android.tools.r8.naming.ClassNameMapper$MissingFileAction -> com.android.tools.r8.naming.b$c:
     com.android.tools.r8.naming.ClassNameMapper$MissingFileAction MISSING_FILE_IS_ERROR -> b
     com.android.tools.r8.naming.ClassNameMapper$MissingFileAction MISSING_FILE_IS_EMPTY_MAP -> a
-    1:2:void <clinit>():47:48 -> <clinit>
-    1:1:void <init>(java.lang.String,int):46:46 -> <init>
+    1:2:void <clinit>():39:40 -> <clinit>
+    1:1:void <init>(java.lang.String,int):38:38 -> <init>
 com.android.tools.r8.naming.ClassNameMinifier -> com.android.tools.r8.naming.c:
     java.util.function.Predicate isUsed -> j
     com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy classNamingStrategy -> b
@@ -67144,8 +67508,9 @@
 com.android.tools.r8.naming.ClassNaming -> com.android.tools.r8.naming.d:
     com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature) -> a
 com.android.tools.r8.naming.ClassNaming$Builder -> com.android.tools.r8.naming.d$a:
-    1:1:void <init>():16:16 -> <init>
-    void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
+    1:1:void <init>():19:19 -> <init>
+    com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
+    void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer) -> a
     com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming) -> a
 com.android.tools.r8.naming.ClassNamingForMapApplier -> com.android.tools.r8.naming.f:
     com.android.tools.r8.com.google.common.collect.ImmutableMap qualifiedMethodMembers -> d
@@ -67155,19 +67520,19 @@
     java.lang.String originalName -> a
     boolean $assertionsDisabled -> g
     java.lang.String renamedName -> b
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):35:35 -> <init>
-    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):123:129 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():133:133 -> a
-    2:3:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):146:147 -> a
-    2:3:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):139 -> a
-    4:5:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):154:155 -> a
-    4:5:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):140 -> a
-    6:16:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):163:173 -> a
-    1:11:boolean equals(java.lang.Object):222:232 -> equals
-    1:1:int hashCode():237:237 -> hashCode
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):38:38 -> <init>
+    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):133:139 -> <init>
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():143:143 -> a
+    2:3:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):156:157 -> a
+    2:3:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):149 -> a
+    4:5:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):164:165 -> a
+    4:5:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):150 -> a
+    6:16:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):173:183 -> a
+    1:11:boolean equals(java.lang.Object):232:242 -> equals
+    1:1:int hashCode():247:247 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
-    2:2:int hashCode():237 -> hashCode
+    2:2:int hashCode():247 -> hashCode
 com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> com.android.tools.r8.naming.e:
 com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.naming.f$a:
     com.android.tools.r8.position.Position position -> c
@@ -67177,92 +67542,101 @@
     java.lang.String renamedName -> b
     java.util.Map methodMembers -> f
     java.util.Map fieldMembers -> g
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):37:37 -> <init>
-    2:2:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):47:47 -> <init>
-    3:11:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):43:51 -> <init>
-    void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
-    1:1:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):61:61 -> a
-    2:2:com.android.tools.r8.naming.ClassNamingForMapApplier build():80:80 -> a
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.ClassNamingForMapApplier$1):40:40 -> <init>
+    2:2:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):50:50 -> <init>
+    3:11:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):46:54 -> <init>
+    com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
+    void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer) -> a
+    1:1:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):64:64 -> a
+    2:2:com.android.tools.r8.naming.ClassNamingForMapApplier build():83:83 -> a
     3:3:boolean com.android.tools.r8.naming.MemberNaming.isMethodNaming():87:87 -> a
-    3:3:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58 -> a
-    4:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):59:65 -> a
-    11:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):64:64 -> a
-    12:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:72 -> a
-    22:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):71:71 -> a
-    23:23:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):70:70 -> a
+    3:3:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):61 -> a
+    4:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:68 -> a
+    11:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):67:67 -> a
+    12:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):66:75 -> a
+    22:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):74:74 -> a
+    23:23:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):73:73 -> a
 com.android.tools.r8.naming.ClassNamingForNameMapper -> com.android.tools.r8.naming.g:
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> c
     java.lang.String originalName -> a
-    boolean $assertionsDisabled -> g
+    java.util.List additionalMappingInfo -> g
+    boolean $assertionsDisabled -> h
     java.util.Map mappedRangesByRenamedName -> e
     java.lang.String renamedName -> b
     java.util.Map mappedFieldNamingsByName -> f
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:1:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForNameMapper$1):29:29 -> <init>
-    2:8:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map):209:215 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName getMappedRangesForRenamedName(java.lang.String):219:219 -> a
-    2:8:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):224:230 -> a
-    9:9:java.util.Collection allFieldNamings():285:285 -> a
-    10:16:void write(com.android.tools.r8.utils.ChainableStringConsumer,java.util.List):301:307 -> a
-    17:18:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):279:280 -> a
-    17:18:void write(com.android.tools.r8.utils.ChainableStringConsumer,java.util.List):307 -> a
-    19:25:void write(com.android.tools.r8.utils.ChainableStringConsumer,java.util.List):311:317 -> a
-    26:26:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):304:304 -> a
-    27:27:void lambda$write$1(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming):307:307 -> a
-    28:28:int lambda$write$2(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):315:315 -> a
-    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):236:246 -> b
-    12:20:java.util.List lookupByOriginalName(java.lang.String):255:263 -> b
-    21:21:java.util.Collection allMethodNamings():297:297 -> b
-    1:11:boolean equals(java.lang.Object):333:343 -> equals
-    1:5:int hashCode():348:352 -> hashCode
-    1:3:java.lang.String toString():323:325 -> toString
+    1:1:void <clinit>():30:30 -> <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):30:30 -> <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):233:240 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName getMappedRangesForRenamedName(java.lang.String):248:248 -> a
+    2:8:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):253:259 -> a
+    9:9:java.util.Collection allFieldNamings():314:314 -> a
+    10:16:void write(com.android.tools.r8.utils.ChainableStringConsumer):330:336 -> a
+    17:18:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):308:309 -> a
+    17:18:void write(com.android.tools.r8.utils.ChainableStringConsumer):336 -> a
+    19:27:void write(com.android.tools.r8.utils.ChainableStringConsumer):340:348 -> a
+    28:28:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):333:333 -> a
+    29:29:void lambda$write$1(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming):336:336 -> a
+    30:30:int lambda$write$2(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):344:344 -> a
+    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):265:275 -> b
+    12:20:java.util.List lookupByOriginalName(java.lang.String):284:292 -> b
+    21:21:java.util.Collection allMethodNamings():326:326 -> b
+    1:1:java.util.List getAdditionalMappingInfo():244:244 -> c
+    1:11:boolean equals(java.lang.Object):365:375 -> equals
+    1:5:int hashCode():380:384 -> hashCode
+    1:3:java.lang.String toString():355:357 -> toString
 com.android.tools.r8.naming.ClassNamingForNameMapper$1 -> com.android.tools.r8.naming.g$a:
 com.android.tools.r8.naming.ClassNamingForNameMapper$Builder -> com.android.tools.r8.naming.g$b:
     java.util.Map methodMembers -> c
     java.util.Map fieldMembers -> d
     java.lang.String originalName -> a
+    java.util.List additionalMappingInfo -> g
     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):31:31 -> <init>
-    2:2:void <init>(java.lang.String,java.lang.String):40:40 -> <init>
-    3:10:void <init>(java.lang.String,java.lang.String):35:42 -> <init>
-    1:10:com.android.tools.r8.naming.ClassNamingForNameMapper build():62:71 -> a
-    11:13:void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):82:84 -> a
-    14:14:java.util.List lambda$addMappedRange$1(java.lang.String):83:83 -> a
-    15:15:boolean com.android.tools.r8.naming.MemberNaming.isMethodNaming():87:87 -> a
-    15:15:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):47 -> a
-    16:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):48:53 -> a
-    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):52:52 -> b
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):32:32 -> <init>
+    2:2:void <init>(java.lang.String,java.lang.String):42:42 -> <init>
+    3:11:void <init>(java.lang.String,java.lang.String):36:44 -> <init>
+    1:10:com.android.tools.r8.naming.ClassNamingForNameMapper build():64:73 -> 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):49 -> a
+    12:17:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):50:55 -> a
+    18:20:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):90:92 -> a
+    21:21:java.util.List lambda$addMappedRange$1(java.lang.String):92:92 -> a
+    22:28:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):99:105 -> a
+    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):54:54 -> b
 com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange -> com.android.tools.r8.naming.g$c:
+    java.util.List additionalMappingInfo -> f
     com.android.tools.r8.naming.Range minifiedRange -> a
-    int nextSequenceNumber -> f
     java.lang.Object originalRange -> c
-    boolean $assertionsDisabled -> g
+    int nextSequenceNumber -> g
     int sequenceNumber -> e
+    boolean $assertionsDisabled -> h
     com.android.tools.r8.naming.MemberNaming$MethodSignature signature -> b
     java.lang.String renamedName -> d
-    1:3:void <clinit>():374:376 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):374:374 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):394:394 -> <init>
-    3:15:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):391:403 -> <init>
-    1:1:int access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):374:374 -> a
-    2:2:int getNextSequenceNumber():379:379 -> a
-    3:22:int getOriginalLineNumber(int):407:426 -> a
-    1:10:boolean equals(java.lang.Object):461:470 -> equals
-    1:4:int hashCode():476:479 -> hashCode
-    1:10:java.lang.String toString():442:451 -> toString
+    1:3:void <clinit>():406:408 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):406:406 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):428:428 -> <init>
+    3:17:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):423:437 -> <init>
+    1:1:java.util.List access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):406:406 -> a
+    2:2:int getNextSequenceNumber():411:411 -> a
+    3:9:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):442:448 -> a
+    10:29:int getOriginalLineNumber(int):461:480 -> a
+    1:1:int access$500(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):406:406 -> b
+    2:3:boolean isCompilerSynthesized():452:453 -> b
+    1:10:boolean equals(java.lang.Object):515:524 -> equals
+    1:4:int hashCode():530:533 -> hashCode
+    1:10:java.lang.String toString():496:505 -> toString
 com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName -> com.android.tools.r8.naming.g$d:
     java.util.List mappedRanges -> a
-    1:2:void <init>(java.util.List):92:93 -> <init>
-    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):89:89 -> a
-    2:2:java.util.List allRangesForLine(int):123:123 -> a
-    3:22:java.util.List allRangesForLine(int,boolean):136:155 -> a
-    23:23:java.util.List getMappedRanges():159:159 -> a
-    1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):102:109 -> b
-    1:7:boolean equals(java.lang.Object):167:173 -> equals
-    1:1:int hashCode():178:178 -> hashCode
+    1:2:void <init>(java.util.List):113:114 -> <init>
+    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):110:110 -> a
+    2:2:java.util.List allRangesForLine(int):144:144 -> a
+    3:22:java.util.List allRangesForLine(int,boolean):157:176 -> a
+    23:23:java.util.List getMappedRanges():180:180 -> a
+    1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):123:130 -> b
+    1:7:boolean equals(java.lang.Object):188:194 -> equals
+    1:1:int hashCode():199:199 -> hashCode
 com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.naming.h:
     java.nio.file.Path path -> b
     java.io.BufferedReader reader -> a
@@ -67476,7 +67850,7 @@
     271:271:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):240 -> a
     272:350:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):243:321 -> a
     351:357:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):320:326 -> a
-    358:358:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):115:115 -> a
+    358:358:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):116:116 -> a
     358:358:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):325 -> a
     359:359:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:324 -> a
     360:360:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):322:322 -> a
@@ -67489,7 +67863,7 @@
     90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):114:120 -> a
     97:99:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):180:182 -> a
     100:105:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):186:191 -> a
-    106:106:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1438:1438 -> a
+    106:106:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1453:1453 -> a
     106:106:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):191 -> a
     107:115:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):205:213 -> a
     116:128:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):212:224 -> a
@@ -67575,7 +67949,7 @@
     2:4:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):410:412 -> a
     5:7:void reserveNamesInInterfaces(java.lang.Iterable):400:402 -> a
     5:7:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):413 -> a
-    8:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:103 -> a
+    8:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):113:113 -> a
     8:10:void reserveNamesInInterfaces(java.lang.Iterable):402 -> a
     8:10:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):413 -> a
     11:13:void reserveNamesInInterfaces(java.lang.Iterable):403:405 -> a
@@ -67593,46 +67967,43 @@
     215:223:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.io.PrintStream):709:717 -> a
     215:223:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):577 -> a
     224:230:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):584:590 -> a
-    231:231:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
+    231:231:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):109:109 -> a
     231:231:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):590 -> a
-    232:236:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):591:595 -> a
-    237:237:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> a
-    237:237:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):595 -> a
-    238:239:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):596:597 -> a
-    240:240:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
-    240:240:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):597 -> a
-    241:247:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):598:604 -> a
-    248:248:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):430:430 -> a
-    249:284:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):452:487 -> a
-    285:289:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):486:490 -> a
-    290:303:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):489:502 -> a
-    304:305:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
-    304:305:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    306:307:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
-    306:307:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
-    306:307:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    308:310:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
-    308:310:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    308:310:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    311:311:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
-    311:311:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    232:238:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):591:597 -> a
+    239:239:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):109:109 -> a
+    239:239:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):597 -> a
+    240:246:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):598:604 -> a
+    247:247:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):430:430 -> a
+    248:283:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):452:487 -> a
+    284:288:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):486:490 -> a
+    289:302:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):489:502 -> a
+    303:304:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
+    303:304:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    305:306:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
+    305:306:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
+    305:306:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    307:309:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
+    307:309:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    307:309:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    310:310:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
+    310:310:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    310:310:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
+    311:311:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
     311:311:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    312:312:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
-    312:312:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):503 -> a
-    313:316:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):608:611 -> a
-    317:317:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
-    317:317:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):611 -> a
-    318:321:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):613:616 -> a
-    322:322:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):615:615 -> a
-    323:323:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):625:625 -> a
-    324:326:void computeReservationFrontiersForAllImplementingClasses():640:642 -> a
-    327:331:void lambda$computeReservationFrontiersForAllImplementingClasses$6(com.android.tools.r8.graph.DexClass):645:649 -> a
-    332:335:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):651:654 -> a
-    336:336:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):108:108 -> a
-    336:336:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):654 -> a
-    337:343:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):655:661 -> a
-    344:346:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:103 -> a
-    344:346:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):661 -> a
+    312:315:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):608:611 -> a
+    316:316:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):109:109 -> a
+    316:316:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):611 -> a
+    317:320:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):613:616 -> a
+    321:321:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):615:615 -> a
+    322:322:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):625:625 -> a
+    323:325:void computeReservationFrontiersForAllImplementingClasses():640:642 -> a
+    326:330:void lambda$computeReservationFrontiersForAllImplementingClasses$6(com.android.tools.r8.graph.DexClass):645:649 -> a
+    331:334:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):651:654 -> a
+    335:335:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):118:118 -> a
+    335:335:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):654 -> a
+    336:342:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):655:661 -> a
+    343:345:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):113:113 -> a
+    343:345:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):661 -> a
     1:1:com.android.tools.r8.naming.MethodNameMinifier$State access$100(com.android.tools.r8.naming.InterfaceMethodNameMinifier):97:97 -> b
     2:2:java.util.Comparator getDefaultInterfaceMethodOrdering():396:396 -> b
     3:3:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):491:491 -> b
@@ -67663,9 +68034,7 @@
     20:28:boolean isAvailable(com.android.tools.r8.graph.DexString):302:310 -> a
     29:30:java.lang.Boolean lambda$isAvailable$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):305:306 -> a
     31:31:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):314:314 -> a
-    32:32:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):316:316 -> a
-    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> a
-    33:33:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):317 -> a
+    32:33:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):316:317 -> a
     34:34:void forEachState(java.util.function.BiConsumer):322:322 -> a
     35:35:java.lang.Object lambda$forEachState$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):324:324 -> a
     36:38:java.lang.Object forAnyState(java.util.function.BiFunction):332:334 -> a
@@ -67673,12 +68042,7 @@
     1:1:java.util.List access$500(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):237:237 -> b
     2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexEncodedMethod):252:252 -> b
     3:3:void reserveName(com.android.tools.r8.graph.DexString):288:288 -> b
-    4:7:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290:293 -> b
-    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> b
-    8:8:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
-    9:10:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):295:296 -> b
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):91:91 -> b
-    11:11:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296 -> b
+    4:10:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290:296 -> b
     1:1:java.util.Set access$600(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):237:237 -> c
     1:1:int compareTo(java.lang.Object):237:237 -> compareTo
     2:2:int compareTo(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):358:358 -> compareTo
@@ -67694,7 +68058,7 @@
     1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):108:108 -> <init>
     2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):104:109 -> <init>
     1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):115:116 -> a
-    3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):112:112 -> a
+    3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):122:122 -> a
     3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):116 -> a
     4:19:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):123:138 -> a
     20:27:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):126:133 -> a
@@ -67702,19 +68066,19 @@
     29:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):172:172 -> a
     30:30:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):174:174 -> a
     31:31:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    32:32:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> a
+    32:32:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):109:109 -> a
     32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175 -> a
     33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):175:175 -> a
     34:34:void forAll(java.util.function.Consumer):179:179 -> a
     35:35:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):181:181 -> a
     36:44:java.lang.Object forAny(java.util.function.Function):187:195 -> a
     1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):150:150 -> b
-    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):95:95 -> b
+    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):105:105 -> b
     2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):150 -> b
     3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):151:151 -> b
     4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):157:168 -> b
     16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160:161 -> b
-    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):99:99 -> b
+    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):109:109 -> b
     18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161 -> b
     19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):162:163 -> b
     21:28:java.lang.Object forChildren(java.util.function.Function):216:223 -> b
@@ -67828,51 +68192,56 @@
     com.android.tools.r8.naming.MemberNamingStrategy strategy -> c
     java.util.Map namingStates -> g
     java.util.Map frontiers -> h
-    1:1:void <clinit>():84:84 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):136:136 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):120:143 -> <init>
+    1:1:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):146:146 -> <init>
+    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.naming.MemberNamingStrategy):130:153 -> <init>
     java.lang.Object lambda$getNamingKeyTransform$2(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):84:84 -> a
-    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):84:84 -> a
-    4:6:java.util.function.Function getNamingKeyTransform():158:160 -> a
-    7:7:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,com.android.tools.r8.utils.Timing):179:179 -> a
-    8:11:void reserveNamesInClasses():237:237 -> a
-    8:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,com.android.tools.r8.utils.Timing):180 -> a
-    12:28:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,com.android.tools.r8.utils.Timing):181:197 -> a
-    29:37:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):201:209 -> a
-    38:51:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):220:233 -> a
-    38:51:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):210 -> a
-    52:53:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):213:214 -> a
-    54:54:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):206:206 -> a
-    55:66:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):264:275 -> a
-    67:67:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):329:329 -> a
-    67:67:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275 -> a
-    68:71:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275:278 -> a
-    72:72:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):271:271 -> a
-    73:83:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):287:297 -> a
-    84:94:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):311:321 -> a
-    84:94:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):302 -> a
-    95:97:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303:305 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> b
-    2:8:java.util.function.Function getReservationKeyTransform():147:153 -> b
-    9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):150:150 -> b
-    10:22:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):245:257 -> b
-    23:23:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255:255 -> b
-    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> c
-    2:2:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):153:153 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):84:84 -> e
+    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> a
+    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):92:92 -> a
+    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):92:92 -> a
+    4:6:java.util.function.Function getNamingKeyTransform():168:170 -> a
+    7:7:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):191:191 -> a
+    8:11:void reserveNamesInClasses():252:252 -> a
+    8:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):192 -> a
+    12:31:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):193:212 -> a
+    32:40:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):216:224 -> a
+    41:54:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):235:248 -> a
+    41:54:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):225 -> a
+    55:56:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):228:229 -> a
+    57:57:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):221:221 -> a
+    58:69:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):279:290 -> a
+    70:70:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):398:398 -> a
+    70:70:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):290 -> a
+    71:74:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):290:293 -> a
+    75:75:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):286:286 -> a
+    76:86:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):302:312 -> a
+    87:97:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):326:336 -> a
+    87:97:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):317 -> a
+    98:100:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):318:320 -> a
+    101:108:void renameNonReboundReferences(java.util.concurrent.ExecutorService):342:349 -> a
+    109:109:void lambda$renameNonReboundReferences$5(java.util.Map,com.android.tools.r8.graph.DexMethod):347:347 -> a
+    110:145:void renameNonReboundMethodReference(com.android.tools.r8.graph.DexMethod,java.util.Map):354:389 -> a
+    146:146:boolean lambda$renameNonReboundMethodReference$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):386:386 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> b
+    2:8:java.util.function.Function getReservationKeyTransform():157:163 -> b
+    9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):160:160 -> b
+    10:22:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):260:272 -> b
+    23:23:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):270:270 -> b
+    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> c
+    2:2:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):163:163 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> d
+    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> e
 com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.naming.y:
 com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.z$a:
     java.util.Map renaming -> a
-    1:1:void <init>(java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):163:163 -> <init>
-    2:3:void <init>(java.util.Map):167:168 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():172:172 -> a
+    1:1:void <init>(java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):173:173 -> <init>
+    2:3:void <init>(java.util.Map):177:178 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():182:182 -> a
 com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.naming.A:
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):88:88 -> <init>
-    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):95:95 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):96:96 -> <init>
+    1:2:void putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):99:100 -> a
+    3:3:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):105:105 -> a
 com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.D:
     com.android.tools.r8.naming.MethodNamingState parentNamingState -> d
     com.android.tools.r8.naming.MemberNamingStrategy namingStrategy -> e
@@ -67953,23 +68322,21 @@
     boolean $assertionsDisabled -> h
     java.util.Map packageRenaming -> f
     java.util.Map renaming -> g
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming):39:39 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming):32:44 -> <init>
-    1:1:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):54:54 -> a
-    2:17:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):59:74 -> a
-    18:26:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):73:81 -> a
-    27:32:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):80:85 -> a
-    33:36:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):84:87 -> a
-    37:54:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):92:109 -> a
-    55:63:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):108:116 -> a
-    64:64:boolean lambda$lookupName$0(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):109:109 -> a
-    65:65:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):121:121 -> a
-    66:66:void lambda$verifyRenamingConsistentWithResolution$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):166:166 -> a
-    67:77:void lambda$toString$2(java.lang.StringBuilder,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexString):176:186 -> a
-    1:1:java.lang.String lookupPackageName(java.lang.String):49:49 -> b
-    2:36:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):130:164 -> b
-    1:16:java.lang.String toString():173:188 -> toString
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming):37:37 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming):30:42 -> <init>
+    1:1:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):52:52 -> a
+    2:17:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):57:72 -> a
+    18:26:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):71:79 -> a
+    27:32:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):78:83 -> a
+    33:36:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):82:85 -> a
+    37:37:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):90:90 -> a
+    38:38:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):95:95 -> a
+    39:39:void lambda$verifyRenamingConsistentWithResolution$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):140:140 -> a
+    40:50:void lambda$toString$1(java.lang.StringBuilder,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexString):150:160 -> a
+    1:1:java.lang.String lookupPackageName(java.lang.String):47:47 -> b
+    2:36:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):104:138 -> b
+    1:16:java.lang.String toString():147:162 -> toString
 com.android.tools.r8.naming.Minifier -> com.android.tools.r8.naming.I:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -68128,8 +68495,7 @@
     3:3:com.android.tools.r8.graph.DexString getRenaming(com.android.tools.r8.graph.DexType):50:50 -> e
     1:1:boolean isRenamed(com.android.tools.r8.graph.DexType):44:44 -> f
 com.android.tools.r8.naming.ProguardMap$Builder -> com.android.tools.r8.naming.M:
-    1:1:void <init>():14:14 -> <init>
-    void addMappingInformation(com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer) -> a
+    1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position) -> a
 com.android.tools.r8.naming.ProguardMapError -> com.android.tools.r8.naming.N:
     1:1:void <init>(java.lang.String,com.android.tools.r8.position.Position):17:17 -> <init>
@@ -68168,7 +68534,7 @@
     51:51:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):353:353 -> a
     51:51:void computeDefaultInterfaceMethodMethods():339 -> a
     51:51:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    52:52:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):834:834 -> a
+    52:52:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> a
     52:52:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):353 -> a
     52:52:void computeDefaultInterfaceMethodMethods():339 -> a
     52:52:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
@@ -68248,7 +68614,7 @@
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):459 -> a
     4:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):460:474 -> a
-    19:19:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
+    19:19:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
     19:19:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):474 -> a
     20:20:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):474:474 -> a
     21:32:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):483:494 -> a
@@ -68276,117 +68642,120 @@
     15:19:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):573 -> a
     20:20:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):574:574 -> a
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.U:
-    java.lang.String line -> g
     java.util.HashMap cache -> j
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
+    java.lang.String line -> h
     com.android.tools.r8.com.google.gson.JsonParser jsonParser -> b
     boolean $assertionsDisabled -> k
     java.io.BufferedReader reader -> a
-    int lineOffset -> f
-    int lineNo -> e
-    com.android.tools.r8.naming.MapVersion version -> h
-    com.android.tools.r8.naming.mappinginformation.ScopeReference implicitSingletonScope -> i
+    boolean allowExperimentalMapping -> e
+    int lineNo -> f
+    int lineOffset -> g
+    com.android.tools.r8.naming.MapVersion version -> i
     boolean allowEmptyMappedRanges -> d
-    1:1:void <clinit>():65:65 -> <clinit>
-    1:1:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):80:80 -> <init>
-    2:353:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):68:419 -> <init>
-    354:358:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):81:85 -> <init>
-    1:1:int access$000(com.android.tools.r8.naming.ProguardMapReader):65:65 -> a
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:1:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):80:80 -> <init>
+    2:370:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):66:434 -> <init>
+    371:376:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):81:86 -> <init>
+    1:1:int access$000(com.android.tools.r8.naming.ProguardMapReader):63:63 -> a
     2:3:char peekChar(int):100:101 -> a
     4:8:boolean isEmptyOrCommentLine(java.lang.String):139:143 -> a
     9:13:boolean hasFirstCharJsonBrace(java.lang.String,int):166:170 -> a
     14:14:boolean hasLine():187:187 -> a
     15:19:void expect(char):209:213 -> a
-    20:20:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> a
+    20:20:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> a
     20:20:void expect(char):213 -> a
     21:21:void expect(char):213:213 -> a
     22:22:void expect(char):210:210 -> a
     23:26:void parse(com.android.tools.r8.naming.ProguardMap$Builder):220:223 -> a
-    27:29:void lambda$parseClassMappings$0(com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation):235:237 -> a
-    30:30:void lambda$parseClassMappings$0(com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation):236:236 -> a
-    31:31:void parseMappingInformation(java.util.function.BiConsumer):272:272 -> a
-    32:38:com.android.tools.r8.com.google.gson.JsonObject parseJsonInComment():546:552 -> a
-    32:38:void parseMappingInformation(java.util.function.BiConsumer):274 -> a
-    39:39:void parseMappingInformation(java.util.function.BiConsumer):274:274 -> a
-    40:40:void parseMappingInformation(java.util.function.BiConsumer):272:272 -> a
-    41:45:void lambda$parseMappingInformation$1(java.util.function.BiConsumer,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation):279:283 -> a
-    46:73:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):296:323 -> a
-    74:75:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):318:319 -> a
-    76:76:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> a
-    76:76:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):319 -> a
-    77:83:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):319:325 -> a
-    84:84:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():457:457 -> a
-    84:84:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):326 -> a
-    85:87:void expectWhitespace():199:201 -> a
-    85:87:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():458 -> a
-    85:87:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):326 -> a
-    88:112:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():459:483 -> a
-    88:112:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):326 -> a
-    113:120:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):327:334 -> a
-    121:121:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> a
-    121:121:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):334 -> a
-    122:126:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):334:338 -> a
-    127:127:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> a
-    127:127:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):338 -> a
-    128:131:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):338:341 -> a
-    132:133:void skipArrow():489:490 -> a
-    132:133:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):342 -> a
-    134:159:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):343:368 -> a
-    160:160:com.android.tools.r8.position.TextPosition getPosition():383:383 -> a
-    160:160:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):368 -> a
-    161:170:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):368:377 -> a
-    171:171:void expectWhitespace():204:204 -> a
-    171:171:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():458 -> a
-    171:171:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):326 -> a
-    172:172:void lambda$parseMemberMappings$3(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation):299:299 -> a
-    173:175:void lambda$parseMemberMappings$2(com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation):303:303 -> a
-    176:188:java.lang.String parseType(boolean):441:453 -> a
+    27:27:void lambda$parseClassMappings$0(com.android.tools.r8.naming.mappinginformation.MappingInformation):234:234 -> a
+    28:28:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isMetaInfMappingInformation():0:0 -> a
+    28:28:void lambda$parseClassMappings$0(com.android.tools.r8.naming.mappinginformation.MappingInformation):234 -> a
+    29:29:void lambda$parseClassMappings$0(com.android.tools.r8.naming.mappinginformation.MappingInformation):234:234 -> a
+    30:30:void parseMappingInformation(java.util.function.Consumer):266:266 -> a
+    31:37:com.android.tools.r8.com.google.gson.JsonObject parseJsonInComment():561:567 -> a
+    31:37:void parseMappingInformation(java.util.function.Consumer):268 -> a
+    38:38:void parseMappingInformation(java.util.function.Consumer):268:268 -> a
+    39:39:void parseMappingInformation(java.util.function.Consumer):266:266 -> a
+    40:53:void lambda$parseMappingInformation$1(java.util.function.Consumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):272:285 -> a
+    54:92:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):299:337 -> a
+    93:94:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):332:333 -> a
+    95:95:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> a
+    95:95:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):333 -> a
+    96:102:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):333:339 -> a
+    103:103:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():472:472 -> a
+    103:103:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):340 -> a
+    104:106:void expectWhitespace():199:201 -> a
+    104:106:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():473 -> a
+    104:106:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):340 -> a
+    107:131:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():474:498 -> a
+    107:131:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):340 -> a
+    132:139:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):341:348 -> a
+    140:140:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> a
+    140:140:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):348 -> a
+    141:145:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):348:352 -> a
+    146:146:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> a
+    146:146:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):352 -> a
+    147:150:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):352:355 -> a
+    151:152:void skipArrow():504:505 -> a
+    151:152:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):356 -> a
+    153:179:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):357:383 -> a
+    180:180:com.android.tools.r8.position.TextPosition getPosition():398:398 -> a
+    180:180:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):383 -> a
+    181:190:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):383:392 -> a
+    191:191:void expectWhitespace():204:204 -> a
+    191:191:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():473 -> a
+    191:191:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):340 -> a
+    192:199:void lambda$parseMemberMappings$4(com.android.tools.r8.naming.MemberNaming,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):305:312 -> a
+    200:202:void lambda$parseMemberMappings$2(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation):308:308 -> a
+    203:215:java.lang.String parseType(boolean):456:468 -> a
     boolean isSimpleDigit(char) -> b
-    1:1:int access$100(com.android.tools.r8.naming.ProguardMapReader):65:65 -> b
+    1:1:int access$100(com.android.tools.r8.naming.ProguardMapReader):63:63 -> b
     2:2:boolean hasNext():106:106 -> b
-    3:22:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):229:248 -> b
-    23:28:boolean acceptString(java.lang.String):504:509 -> b
-    23:28:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):248 -> b
-    29:31:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):251:253 -> b
-    32:34:boolean acceptArrow():494:496 -> b
-    32:34:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):254 -> b
-    35:38:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):256:259 -> b
-    39:39:com.android.tools.r8.position.TextPosition getPosition():383:383 -> b
-    39:39:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):261 -> b
-    40:44:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):261:265 -> b
-    45:56:void skipIdentifier(boolean):390:401 -> b
-    57:57:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> b
-    57:57:void skipIdentifier(boolean):401 -> b
-    58:70:void skipIdentifier(boolean):401:413 -> b
-    71:71:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> b
-    71:71:void skipIdentifier(boolean):413 -> b
-    72:72:void skipIdentifier(boolean):413:413 -> b
-    73:73:void skipIdentifier(boolean):406:406 -> b
-    74:78:java.lang.String substring(int):422:426 -> b
+    3:18:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):229:244 -> b
+    19:24:boolean acceptString(java.lang.String):519:524 -> b
+    19:24:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):244 -> b
+    25:27:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):247:249 -> b
+    28:30:boolean acceptArrow():509:511 -> b
+    28:30:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):250 -> b
+    31:34:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):252:255 -> b
+    35:35:com.android.tools.r8.position.TextPosition getPosition():398:398 -> b
+    35:35:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):257 -> b
+    36:39:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):257:260 -> b
+    40:42:void lambda$parseMemberMappings$3(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation):315:315 -> b
+    43:54:void skipIdentifier(boolean):405:416 -> b
+    55:55:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> b
+    55:55:void skipIdentifier(boolean):416 -> b
+    56:68:void skipIdentifier(boolean):416:428 -> b
+    69:69:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> b
+    69:69:void skipIdentifier(boolean):428 -> b
+    70:70:void skipIdentifier(boolean):428:428 -> b
+    71:71:void skipIdentifier(boolean):421:421 -> b
+    72:76:java.lang.String substring(int):437:441 -> b
     1:8:boolean isCommentLineWithJsonBrace():151:158 -> c
-    1:1:void close():74:74 -> close
-    1:12:java.lang.Object maybeParseRangeOrInt():519:530 -> d
+    1:1:void close():73:73 -> close
+    1:12:java.lang.Object maybeParseRangeOrInt():534:545 -> d
     1:5:char nextChar():120:124 -> e
-    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> e
+    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> e
     6:6:char nextChar():124 -> e
     7:7:char nextChar():124:124 -> e
     1:5:int nextCodePoint():111:115 -> f
-    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> f
+    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> f
     6:6:int nextCodePoint():115 -> f
     7:7:int nextCodePoint():115:115 -> f
     1:1:boolean nextLine():129:129 -> g
     2:7:boolean skipLine():178:183 -> g
     2:7:boolean nextLine():132 -> g
     8:8:boolean nextLine():130:130 -> g
-    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> g
+    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> g
     9:9:boolean nextLine():130 -> g
     10:10:boolean nextLine():130:130 -> g
-    1:7:java.lang.String parseMethodName():431:437 -> h
-    1:7:int parseNumber():535:541 -> i
-    8:8:int parseNumber():536:536 -> i
-    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):567:567 -> i
-    9:9:int parseNumber():536 -> i
-    10:10:int parseNumber():536:536 -> i
+    1:7:java.lang.String parseMethodName():446:452 -> h
+    1:7:int parseNumber():550:556 -> i
+    8:8:int parseNumber():551:551 -> i
+    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):582:582 -> i
+    9:9:int parseNumber():551 -> i
+    10:10:int parseNumber():551:551 -> i
     1:1:int peekCodePoint():96:96 -> j
     1:2:void skipWhitespace():192:193 -> k
 com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.T:
@@ -68394,9 +68763,9 @@
     boolean eol -> c
     int lineNo -> a
     java.lang.String msg -> d
-    1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):570:574 -> <init>
-    1:4:java.lang.String toString():579:582 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.Cw:
+    1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):585:589 -> <init>
+    1:4:java.lang.String toString():594:597 -> toString
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.Ww:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -68411,43 +68780,43 @@
     3:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():65 -> a
     6:23:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):83:100 -> a
     6:23:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():66 -> a
-    24:41:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):99:116 -> a
-    24:41:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():66 -> a
-    42:42:void com.android.tools.r8.naming.ProguardMapSupplier.writeBody():79:79 -> a
-    42:42:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():67 -> a
-    43:43:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():68:68 -> a
+    24:38:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):99:113 -> a
+    24:38:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():66 -> a
+    39:39:void com.android.tools.r8.naming.ProguardMapSupplier.writeBody():79:79 -> a
+    39:39:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():67 -> a
+    40:40:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():68:68 -> a
     1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):21:21 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.Cw$a:
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.Cw$b:
+com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.Ww$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.Ww$b:
     java.lang.StringBuilder contents -> b
     com.android.tools.r8.StringConsumer inner -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():148:148 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.StringConsumer):153:153 -> <init>
-    2:9:void <init>(com.android.tools.r8.StringConsumer):151:158 -> <init>
-    10:10:void <init>(com.android.tools.r8.StringConsumer):156:156 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):163:164 -> accept
-    1:2:void finished(com.android.tools.r8.DiagnosticsHandler):169:170 -> finished
-    3:5:boolean com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker.validateProguardMapParses(java.lang.String):175:177 -> finished
-    3:5:void finished(com.android.tools.r8.DiagnosticsHandler):170 -> finished
-    6:6:void finished(com.android.tools.r8.DiagnosticsHandler):170:170 -> finished
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.Cw$c:
+    1:1:void <clinit>():145:145 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.StringConsumer):150:150 -> <init>
+    2:9:void <init>(com.android.tools.r8.StringConsumer):148:155 -> <init>
+    10:10:void <init>(com.android.tools.r8.StringConsumer):153:153 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):160:161 -> accept
+    1:2:void finished(com.android.tools.r8.DiagnosticsHandler):166:167 -> finished
+    3:5:boolean com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker.validateProguardMapParses(java.lang.String):172:174 -> finished
+    3:5:void finished(com.android.tools.r8.DiagnosticsHandler):167 -> finished
+    6:6:void finished(com.android.tools.r8.DiagnosticsHandler):167:167 -> finished
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.Ww$c:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier$1):34:34 -> <init>
     2:4:void <init>(java.lang.String):36:38 -> <init>
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.Cw$d:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.Ww$d:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
-    1:3:void <init>():119:121 -> <init>
-    1:4:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder.accept(java.lang.String):125:128 -> a
-    1:4:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):119 -> a
-    5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build():135:135 -> a
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.Cw$e:
+    1:3:void <init>():116:118 -> <init>
+    1:4:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder.accept(java.lang.String):122:125 -> a
+    1:4:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):116 -> a
+    5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build():132:132 -> a
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.Ww$e:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):139:139 -> <init>
-    1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):143:143 -> a
-    1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):139 -> a
-com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.Cy:
+    1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):136:136 -> <init>
+    1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):140:140 -> a
+    1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):136 -> a
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.Uy:
     int to -> b
     int from -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -68502,43 +68871,42 @@
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     java.util.Set mappedToDescriptorNames -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):40:40 -> <init>
-    2:10:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter):106:114 -> <init>
-    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):96:96 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):87:88 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):96 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):82:82 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):89 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):96 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):90:92 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):96 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):88:92 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):96 -> a
-    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):156:156 -> a
-    14:14:java.util.Set getKeyset():160:160 -> a
-    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):168:168 -> a
-    1:1:java.util.Set getMappedToDescriptorNames():164:164 -> b
-    1:10:void verifyMappingsAreConflictFree():118:127 -> c
-    11:11:void verifyMappingsAreConflictFree():124:124 -> c
-    12:35:void verifyMappingsAreConflictFree():123:146 -> c
+    1:1:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):37:37 -> <init>
+    2:10:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter):95:103 -> <init>
+    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85:85 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):76:77 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):71:71 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):78 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):79:81 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):77:81 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
+    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):145:145 -> a
+    14:14:java.util.Set getKeyset():149:149 -> a
+    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):157:157 -> a
+    1:1:java.util.Set getMappedToDescriptorNames():153:153 -> b
+    1:10:void verifyMappingsAreConflictFree():107:116 -> c
+    11:11:void verifyMappingsAreConflictFree():113:113 -> c
+    12:35:void verifyMappingsAreConflictFree():112:135 -> c
 com.android.tools.r8.naming.SeedMapper$1 -> com.android.tools.r8.naming.Y$a:
 com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.naming.Y$b:
     java.util.Map map -> a
     java.util.Set mappedToDescriptorNames -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):42:42 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.Reporter):47:47 -> <init>
-    3:8:void <init>(com.android.tools.r8.utils.Reporter):43:48 -> <init>
-    void addMappingInformation(com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer) -> a
-    1:5:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):54:58 -> a
-    1:5:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):42 -> a
-    6:6:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder com.android.tools.r8.naming.ClassNamingForMapApplier.builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):95:95 -> a
-    6:6:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):58 -> a
-    6:6:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):42 -> a
-    7:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):60:61 -> a
-    7:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):42 -> a
-    9:10:com.android.tools.r8.naming.SeedMapper build():76:77 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.wC:
+    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):39:39 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.Reporter):44:44 -> <init>
+    3:8:void <init>(com.android.tools.r8.utils.Reporter):40:45 -> <init>
+    1:5:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:55 -> a
+    1:5:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39 -> a
+    6:6:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder com.android.tools.r8.naming.ClassNamingForMapApplier.builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):105:105 -> a
+    6:6:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):55 -> a
+    6:6:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39 -> a
+    7:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):57:58 -> a
+    7:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39 -> a
+    9:10:com.android.tools.r8.naming.SeedMapper build():65:66 -> a
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.WC:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexApplication application -> b
     boolean $assertionsDisabled -> c
@@ -68551,7 +68919,7 @@
     47:65:void lambda$run$2(com.android.tools.r8.graph.DexEncodedMethod):59:77 -> a
     66:66:boolean lambda$run$0(com.android.tools.r8.graph.DexDebugEvent):74:74 -> a
     67:67:com.android.tools.r8.graph.DexDebugEvent[] lambda$run$1(int):75:75 -> a
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.K6:
     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
@@ -68592,7 +68960,7 @@
     1:1:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo none():139:139 -> e
     1:5:boolean equals(java.lang.Object):174:178 -> equals
     1:1:int hashCode():183:183 -> hashCode
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.I6:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.J6:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> a
     boolean $assertionsDisabled -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> b
@@ -68609,7 +68977,7 @@
     52:52:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):63:63 -> a
     53:53:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):54:54 -> a
     54:92:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):46:84 -> a
-com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.Bc:
     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>
@@ -68617,7 +68985,7 @@
     boolean needsToComputeName() -> c
     boolean needsToRegisterReference() -> d
     1:1:com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo forFieldName():21:21 -> e
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.js:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.Cs:
     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
@@ -68633,22 +69001,22 @@
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo asFieldNameComputationInfo() -> b
     boolean needsToComputeName() -> c
     boolean needsToRegisterReference() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.e6:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.f6:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():593:593 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():596:596 -> a
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.H6:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.I6:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.xa:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ya:
     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.Ca:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Da:
     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.Fe:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.af:
     com.android.tools.r8.graph.DexReference reference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -68676,159 +69044,108 @@
     2:2:java.lang.Object com.android.tools.r8.utils.FunctionUtils.applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):15:15 -> c
     2:2:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33 -> c
     3:3:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33:33 -> c
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.Ge:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.bf:
     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.He:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.cf:
     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.NF:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.nG:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
 com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.naming.mappinginformation.c:
+    com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
+    1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1):13:13 -> <init>
-    2:2:void <init>():24:24 -> <init>
-    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):47:47 -> a
-    1:1:java.lang.String getId():32:32 -> c
-    boolean isCompilerSynthesizedMappingInformation() -> d
-    1:3:java.lang.String serialize():52:54 -> e
+    2:2:void <init>():29:29 -> <init>
+    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):52:52 -> a
+    boolean isCompilerSynthesizedMappingInformation() -> c
+    1:3:java.lang.String serialize():57:59 -> d
 com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1 -> com.android.tools.r8.naming.mappinginformation.a:
 com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.naming.mappinginformation.b:
-    1:1:void <init>():17:17 -> <init>
-    1:1:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation build():20:20 -> a
+    1:1:void <init>():18:18 -> <init>
+    1:1:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation build():21:21 -> a
 com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.android.tools.r8.naming.mappinginformation.d:
     java.lang.String fileName -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:2:void <init>(java.lang.String):22:23 -> <init>
+    1:2:void <init>(java.lang.String):21:22 -> <init>
     com.android.tools.r8.naming.mappinginformation.FileNameInformation asFileNameInformation() -> a
-    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):47:47 -> a
+    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):46:46 -> a
     2:2:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isFileNameInformation():0:0 -> a
-    2:2:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):47 -> a
-    3:3:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(java.lang.String):51:51 -> a
-    4:6:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):69:71 -> a
-    7:10:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.naming.mappinginformation.MappingInformation.getJsonElementFromObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.lang.String,java.lang.String):112:115 -> a
-    7:10:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):72 -> a
-    11:11:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.naming.mappinginformation.MappingInformation.getJsonElementFromObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.lang.String,java.lang.String):114:114 -> a
-    11:11:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):72 -> a
-    12:14:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):74:74 -> a
-    19:19:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):79:79 -> a
-    20:20:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):78:78 -> a
-    1:1:java.lang.String getId():28:28 -> c
-    1:4:java.lang.String serialize():56:59 -> e
-    1:1:java.lang.String getFileName():32:32 -> f
+    2:2:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):46 -> a
+    3:3:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(java.lang.String):50:50 -> a
+    4:4:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):68:68 -> a
+    5:8:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.naming.mappinginformation.MappingInformation.getJsonElementFromObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.lang.String,java.lang.String):109:112 -> a
+    5:8:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    9:9:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.naming.mappinginformation.MappingInformation.getJsonElementFromObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.lang.String,java.lang.String):111:111 -> a
+    9:9:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    10:14:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):71:75 -> a
+    15:15:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):74:74 -> a
+    1:4:java.lang.String serialize():55:58 -> d
+    1:1:java.lang.String getFileName():31:31 -> e
+com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation -> com.android.tools.r8.internal.vq:
+    com.android.tools.r8.naming.MapVersion mapVersion -> a
+    1:2:void <init>(com.android.tools.r8.naming.MapVersion):23:24 -> <init>
+    boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation) -> a
+    com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation asMetaInfMappingInformation() -> b
+    1:4:java.lang.String serialize():53:56 -> d
+    1:1:com.android.tools.r8.naming.MapVersion getMapVersion():48:48 -> e
 com.android.tools.r8.naming.mappinginformation.MappingInformation -> com.android.tools.r8.naming.mappinginformation.e:
     1:1:void <init>():13:13 -> <init>
     boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation) -> a
     com.android.tools.r8.naming.mappinginformation.FileNameInformation asFileNameInformation() -> a
-    1:7:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):55:61 -> a
-    8:15:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):60:67 -> a
-    16:16:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):66:66 -> a
-    17:31:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):88:102 -> a
-    17:31:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    32:37:void com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.BiConsumer):67:72 -> a
-    32:37:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):90 -> a
-    32:37:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    38:38:com.android.tools.r8.naming.mappinginformation.ScopeReference com.android.tools.r8.naming.mappinginformation.ScopeReference.globalScope():16:16 -> a
-    38:38:void com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.BiConsumer):76 -> a
-    38:38:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):90 -> a
-    38:38:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    39:39:void com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.BiConsumer):76:76 -> a
-    39:39:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):90 -> a
-    39:39:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    40:40:void com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):64:64 -> a
-    40:40:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):98 -> a
-    40:40:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    41:41:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder.build():20:20 -> a
-    41:41:void com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):67 -> a
-    41:41:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):98 -> a
-    41:41:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    42:44:void com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):69:71 -> a
-    42:44:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):98 -> a
-    42:44:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    45:45:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):94:94 -> a
-    45:45:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.mappinginformation.ScopeReference,java.util.function.BiConsumer):70 -> a
-    com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation asMetaInfMappingInformation() -> b
-    java.lang.String getId() -> c
-    boolean isCompilerSynthesizedMappingInformation() -> d
-    java.lang.String serialize() -> e
+    1:7:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):54:60 -> a
+    8:15:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):59:66 -> a
+    16:16:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):65:65 -> a
+    17:31:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):85:99 -> a
+    17:31:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    32:41:void com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):67:76 -> a
+    32:41:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):87 -> a
+    32:41:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    42:42:boolean com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.isSupported(com.android.tools.r8.naming.MapVersion):26:26 -> a
+    42:42:void com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):68 -> a
+    42:42:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):95 -> a
+    42:42:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    43:43:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder.build():21:21 -> a
+    43:43:void com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    43:43:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):95 -> a
+    43:43:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    44:44:void com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69:69 -> a
+    44:44:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):95 -> a
+    44:44:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    45:45:void deserialize(java.lang.String,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):91:91 -> a
+    45:45:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):69 -> a
+    com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation asMetaInfMappingInformation() -> b
+    boolean isCompilerSynthesizedMappingInformation() -> c
+    java.lang.String serialize() -> d
 com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics -> com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics:
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.position.Position):34:36 -> <init>
-    1:2:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics noHandlerFor(int,java.lang.String):48:49 -> a
-    3:3:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notValidJson(int):60:60 -> a
-    4:5:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics noKeyForObjectWithId(int,java.lang.String,java.lang.String,java.lang.String):78:79 -> a
-    6:7:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics invalidValueForObjectWithId(int,java.lang.String,java.lang.String):85:86 -> a
-    1:2:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics noKeyInJson(int,java.lang.String):54:55 -> b
-    1:2:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notValidString(int,java.lang.String):65:66 -> c
+    1:2:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics noHandlerFor(int,java.lang.String):40:41 -> a
+    3:3:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notValidJson(int):52:52 -> a
+    4:5:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics noKeyForObjectWithId(int,java.lang.String,java.lang.String,java.lang.String):70:71 -> a
+    6:7:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics invalidValueForObjectWithId(int,java.lang.String,java.lang.String):77:78 -> a
+    1:2:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics noKeyInJson(int,java.lang.String):46:47 -> b
+    1:2:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notValidString(int,java.lang.String):57:58 -> c
     1:1:java.lang.String getDiagnosticMessage():31:31 -> getDiagnosticMessage
     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:3:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics invalidScopeFor(int,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation):41:43 -> invalidScopeFor
-    4:4:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics invalidScopeFor(int,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation):42:42 -> invalidScopeFor
-    1:7:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notAllowedCombination(com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation,int):106:112 -> notAllowedCombination
-com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation -> com.android.tools.r8.internal.Lq:
-    com.android.tools.r8.naming.MapVersion mapVersion -> a
-    1:2:void <init>(com.android.tools.r8.naming.MapVersion):23:24 -> <init>
-    boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation) -> a
-    com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation asMetaInfMappingInformation() -> b
-    1:1:java.lang.String getId():29:29 -> c
-    1:4:java.lang.String serialize():53:56 -> e
-    1:1:com.android.tools.r8.naming.MapVersion getMapVersion():48:48 -> f
-com.android.tools.r8.naming.mappinginformation.ScopeReference -> com.android.tools.r8.naming.mappinginformation.f:
-    1:1:void <init>():13:13 -> <init>
-    com.android.tools.r8.references.ClassReference getHolderReference() -> a
-    1:1:com.android.tools.r8.naming.mappinginformation.ScopeReference fromClassReference(com.android.tools.r8.references.ClassReference):20:20 -> a
-    1:1:com.android.tools.r8.naming.mappinginformation.ScopeReference globalScope():16:16 -> b
-    1:1:com.android.tools.r8.naming.mappinginformation.ScopeReference globalScope():16:16 -> c
-    1:1:boolean isGlobalScope():32 -> c
-    2:2:boolean isGlobalScope():32:32 -> c
-    java.lang.String toReferenceString() -> d
-    1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.naming.mappinginformation.ScopeReference$ClassScopeReference -> com.android.tools.r8.naming.mappinginformation.f$a:
-    com.android.tools.r8.references.ClassReference reference -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():79:79 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.references.ClassReference):82:84 -> <init>
-    1:1:com.android.tools.r8.references.ClassReference getHolderReference():94:94 -> a
-    1:1:java.lang.String toReferenceString():89:89 -> d
-    1:2:boolean equals(java.lang.Object):99:100 -> equals
-    1:1:int hashCode():105:105 -> hashCode
-com.android.tools.r8.naming.mappinginformation.ScopeReference$GlobalScopeReference -> com.android.tools.r8.naming.mappinginformation.f$b:
-    com.android.tools.r8.naming.mappinginformation.ScopeReference$GlobalScopeReference INSTANCE -> a
-    1:1:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>():50:50 -> <init>
-    1:1:com.android.tools.r8.references.ClassReference getHolderReference():65:65 -> a
-    1:1:java.lang.String toReferenceString():55:55 -> d
-    1:1:com.android.tools.r8.naming.mappinginformation.ScopeReference$GlobalScopeReference access$000():50:50 -> e
-    1:1:int hashCode():75:75 -> hashCode
-    1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation -> com.android.tools.r8.internal.sB:
-    com.android.tools.r8.naming.MapVersion SCOPE_SUPPORTED -> a
-    1:3:void <clinit>():15:17 -> <clinit>
-    1:11:java.util.List deserializeScope(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.MapVersion):27:37 -> a
-    12:13:com.android.tools.r8.naming.mappinginformation.ScopeReference com.android.tools.r8.naming.mappinginformation.ScopeReference.fromReferenceString(java.lang.String):25:26 -> a
-    12:13:java.util.List deserializeScope(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.MapVersion):37 -> a
-    14:14:java.util.List deserializeScope(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.MapVersion):37:37 -> a
-    15:15:com.android.tools.r8.naming.mappinginformation.ScopeReference com.android.tools.r8.naming.mappinginformation.ScopeReference.fromReferenceString(java.lang.String):28:28 -> a
-    15:15:java.util.List deserializeScope(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.MapVersion):37 -> a
-    16:16:java.util.List deserializeScope(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopeReference,com.android.tools.r8.DiagnosticsHandler,int,com.android.tools.r8.naming.MapVersion):39:39 -> a
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Md:
+    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.signature.GenericSignatureAction -> com.android.tools.r8.internal.he:
     void parsedIdentifier(java.lang.String) -> a
     java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String) -> a
     void parsedSymbol(char) -> a
     java.lang.Object parsedTypeName(java.lang.String,com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition) -> a
     void stop() -> a
     void start() -> b
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Md$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.he$a:
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> c
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> b
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> a
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):14:14 -> <init>
-com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.ie:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> a
     char[] buffer -> e
     int pos -> f
@@ -68872,16 +69189,16 @@
     1:11:void updateOptTypeArguments():252:262 -> f
     1:13:void updateTypeArgument():268:280 -> g
     1:9:void updateTypeVariableSignature():286:294 -> h
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.je:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):25:29 -> <init>
-    1:8:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):36:43 -> a
-    9:16:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):46:53 -> a
-    17:17:void lambda$run$0(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedField):52:52 -> a
-    18:18:void lambda$run$0(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedField):51:51 -> a
-    19:19:void lambda$run$1(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedMethod):56:56 -> a
-    20:20:void lambda$run$1(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedMethod):55:55 -> a
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):23:26 -> <init>
+    1:8:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):33:40 -> a
+    9:16:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):43:50 -> a
+    17:17:void lambda$run$0(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedField):49:49 -> a
+    18:18:void lambda$run$0(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedField):48:48 -> a
+    19:19:void lambda$run$1(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedMethod):53:53 -> a
+    20:20:void lambda$run$1(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedMethod):52:52 -> a
 com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.Z5:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> c
@@ -68916,7 +69233,7 @@
     79:107:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):149:177 -> a
     108:151:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):174:217 -> a
     152:152:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):164:164 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Ec:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Fc:
     boolean $assertionsDisabled -> g
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     1:1:void <clinit>():23:23 -> <clinit>
@@ -68938,15 +69255,15 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():111:111 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.Cc:
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Ec:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
     1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):114:114 -> <init>
     2:2:void <init>():119:119 -> <init>
     3:3:void <init>():116:116 -> <init>
     1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):123:123 -> a
     2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):130:131 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.Ti:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.oj:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod target -> d
@@ -68979,7 +69296,7 @@
     1:1:void registerTypeReference(com.android.tools.r8.graph.DexType):100 -> f
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):95 -> g
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.Si:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.nj:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind ILLEGAL -> d
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind NONE -> e
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind STATIC -> b
@@ -68987,7 +69304,7 @@
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind VIRTUAL -> a
     1:5:void <clinit>():109:113 -> <clinit>
     1:1:void <init>(java.lang.String,int):108:108 -> <init>
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.sq:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.Qq:
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -69041,7 +69358,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):140:140 -> c
     2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):362:366 -> c
     1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):371:388 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.rq:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.Pq:
     java.util.Set val$nonReboundFieldReferences -> c
     com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> d
     1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.DexItemFactory,java.util.Set):400:400 -> <init>
@@ -69059,7 +69376,7 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):419:419 -> g
     1:5:void registerFieldReference(com.android.tools.r8.graph.DexField):423:427 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.vq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.Tq:
     boolean $assertionsDisabled -> h
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> g
@@ -69085,8 +69402,8 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():129:129 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.tq:
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.uq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.Rq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Sq:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> b
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -69100,7 +69417,7 @@
     4:13:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):156:165 -> a
     14:14:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):164:164 -> a
     15:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():174:178 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.xq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.Vq:
     1:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):47:65 -> a
     20:20:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.MethodAccessInfoCollection):72:72 -> a
     21:21:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView):44:44 -> a
@@ -69111,7 +69428,7 @@
     30:30:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):93:93 -> a
     31:31:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):23:23 -> a
     31:31:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):100 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.Uq:
     java.util.Set seenFieldReferences -> g
     java.util.Set seenMethodReferences -> h
     com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder methodAccessInfoCollectionBuilder -> f
@@ -69145,7 +69462,7 @@
     24:24:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> i
     24:24:void registerFieldAccess(com.android.tools.r8.graph.DexField):171 -> i
     25:31:void registerFieldAccess(com.android.tools.r8.graph.DexField):171:177 -> i
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.Aq:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.Yq:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
     java.util.Map methodMaps -> g
@@ -69176,8 +69493,8 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():88:88 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.yq:
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.zq:
+com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.Wq:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.Xq:
     java.util.Map methodMaps -> b
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -69192,7 +69509,7 @@
     11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):179:179 -> a
     11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):174 -> a
     12:12:com.android.tools.r8.optimize.MemberRebindingLens build():183:183 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.By:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.Ty:
     com.android.tools.r8.graph.AppView appView -> n
     boolean $assertionsDisabled -> p
     java.util.Set publicizedMethods -> o
@@ -69211,15 +69528,15 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> l
-com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.zy:
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.Ay:
+com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.Ry:
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.Sy:
     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.LG:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.hH:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -69438,7 +69755,7 @@
     16:26:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:10:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):172:181 -> c
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> d
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.Z6:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.a7:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     int[] cpInfoOffsets -> c
@@ -69628,13 +69945,13 @@
     1:2:short readShort(int):3572:3573 -> f
     3:9:java.lang.String readUtf(int,char[]):3634:3640 -> f
     1:2:int readUnsignedShort(int):3560:3561 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.j7:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.k7:
     java.lang.String className -> a
     int constantPoolCount -> b
     1:3:void <init>(java.lang.String,int):49:51 -> <init>
     1:1:java.lang.String getClassName():60:60 -> a
     1:1:int getConstantPoolCount():69:69 -> b
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.l7:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.m7:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):58:58 -> <init>
@@ -69660,7 +69977,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.u7:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.v7:
 # {"id":"sourceFile","fileName":"ClassWriter.java"}
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -69722,7 +70039,7 @@
     295:295:byte[] toByteArray():720:720 -> b
     296:296:byte[] toByteArray():599:599 -> b
     1:5:void visitPermittedSubclass(java.lang.String):377:381 -> c
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.K8:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.L8:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -69735,7 +70052,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.N8:
+com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.O8:
 # {"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
@@ -69747,7 +70064,7 @@
     23:24:void checkAsmExperimental(java.lang.Object):189 -> a
     25:25:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):207:207 -> a
     25:25:void checkAsmExperimental(java.lang.Object):189 -> a
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.V8:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -69768,15 +70085,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.Y8:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.Z8:
     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.Ya:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.Za:
     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.Mc:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Nc:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:16:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):69:83 -> <init>
@@ -69784,7 +70101,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):95:96 -> a
     3:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:132 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Oc:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> l
@@ -69806,7 +70123,7 @@
     67:67:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):272 -> a
     68:68:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
     1:14:int computeFieldInfoSize():195:208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.qd:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.rd:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -69903,7 +70220,7 @@
     12:16:int pop():567:571 -> b
     17:23:void pop(int):581:587 -> b
     1:16:void push(int):524:539 -> c
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.ne:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -69918,7 +70235,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.Td:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.oe:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -69934,7 +70251,7 @@
     25:26:void com.android.tools.r8.org.objectweb.asm.Handler.<init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
     25:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147 -> a
     27:28:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.Sn:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.po:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
     int bytecodeOffset -> e
@@ -69962,7 +70279,7 @@
     92:126:void addSubroutineRetSuccessors(com.android.tools.r8.org.objectweb.asm.Label):542:576 -> a
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):592:604 -> b
     1:1:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.nr:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.Gr:
     java.lang.String className -> a
     int codeSize -> d
     java.lang.String descriptor -> c
@@ -69972,7 +70289,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.or:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.Hr:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -70017,7 +70334,7 @@
     7:8:void visitMaxs(int,int):772:773 -> c
     9:10:void visitEnd():782:783 -> c
     1:2:void visitVarInsn(int,int):358:359 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.Ir:
     boolean hasSubroutines -> d0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
@@ -70206,7 +70523,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.wr:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.Pr:
     1:1:void <init>(int):57:57 -> <init>
     2:13:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:79 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
@@ -70216,7 +70533,7 @@
     void visitOpen(java.lang.String,int,java.lang.String[]) -> b
     void visitPackage(java.lang.String) -> b
     void visitUse(java.lang.String) -> c
-com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.xr:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.Qr:
     com.android.tools.r8.org.objectweb.asm.ByteVector provides -> n
     int packageCount -> o
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> l
@@ -70245,7 +70562,7 @@
     3:12:void visitOpen(java.lang.String,int,java.lang.String[]):146:155 -> b
     13:13:int getAttributeCount():186:186 -> b
     1:2:void visitUse(java.lang.String):160:161 -> c
-com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.Iu:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.cv:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -70254,14 +70571,14 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():390:396 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Ny:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.oz:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):57:57 -> <init>
     2:16:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):68:82 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean) -> a
     void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.Oy:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.pz:
     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
@@ -70280,7 +70597,7 @@
     56:56:void com.android.tools.r8.org.objectweb.asm.Attribute.putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):279:279 -> a
     56:56:void putRecordComponentInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):213 -> a
     57:57:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):223:223 -> a
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.wE:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.YE:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -70422,7 +70739,7 @@
     2:2:int addType(java.lang.String):1140 -> e
     3:10:int addType(java.lang.String):1141:1148 -> e
     1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
-com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.vE:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.XE:
     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
@@ -70449,7 +70766,7 @@
     40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1298:1298 -> <init>
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.mF:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.NF:
     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
@@ -70486,7 +70803,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
     1:4:int hashCode():877:880 -> hashCode
     1:1:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.AF:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.aG:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -70503,7 +70820,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.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.wj:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Sj:
     java.util.BitSet sharedSubroutineInsns -> F
     java.util.Map subroutinesInsns -> E
     java.util.BitSet mainSubroutineInsns -> D
@@ -70542,7 +70859,7 @@
     103:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
     103:105:void visitEnd():155 -> c
     106:107:void visitEnd():157:158 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.vj:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.Rj:
     java.util.Map clonedLabels -> c
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> a
     java.util.BitSet subroutineInsns -> b
@@ -70610,7 +70927,7 @@
     82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):151:159 -> a
     91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):190:197 -> a
     99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):211:227 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.wc:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.xc:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -70618,7 +70935,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:89 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):94:94 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.rd:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.sd:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -70637,14 +70954,14 @@
     25:44:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):152:171 -> a
     45:51:java.lang.Object[] asArray(java.util.List):178:184 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.gf:
     int incr -> h
     int var -> g
     1:3:void <init>(int,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Yf:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.tg:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode firstInsn -> b
     int size -> a
@@ -70667,7 +70984,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.Yf$a:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.tg$a:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> a
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
@@ -70685,18 +71002,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.Zf:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.ug:
     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.Ih:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.di:
     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.Li:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.gj:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -70705,7 +71022,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.Oj:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.kk:
     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
@@ -70714,7 +71031,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.Tn:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.qo:
     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
@@ -70722,13 +71039,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.xo:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.Uo:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):55:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.Ro:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.op:
     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>
@@ -70738,14 +71055,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.rp:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.Op:
     java.util.List end -> f
     java.util.List start -> e
     java.util.List index -> g
     1:4:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):116:119 -> <init>
     1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):129:138 -> a
     11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):137:137 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.sp:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.Pp:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -70753,7 +71070,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.Op:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.lq:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -70764,7 +71081,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     13:15:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.ar:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.tr:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -70773,7 +71090,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.fr:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.yr:
     java.util.List attrs -> p
     java.util.List invisibleTypeAnnotations -> o
     java.lang.String desc -> j
@@ -70857,22 +71174,22 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):274:278 -> c
     6:7:void visitMaxs(int,int):517:518 -> c
     1:1:void visitVarInsn(int,int):353:353 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.er:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.xr:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):251:251 -> <init>
     1:2:boolean add(java.lang.Object):254:255 -> add
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.Gr:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.Zr:
     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.lv:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.Fv:
     java.lang.String name -> a
     int access -> b
     1:3:void <init>(java.lang.String,int):55:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.KE:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.mF:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -70884,7 +71201,7 @@
     8:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     9:10:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.jF:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.KF:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -70892,30 +71209,30 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):73:77 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.uF:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.VF:
     int typeRef -> c
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> d
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):62:64 -> <init>
     4:6:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):82:84 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.zF:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.ZF:
     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.mG:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.IG:
     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.yG:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.UG:
     int var -> g
     1:2:void <init>(int,int):53:54 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:75 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):80:80 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.kw:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.Ew:
     java.lang.String[] OPCODES -> a
     1:1:void <clinit>():54:54 -> <clinit>
 com.android.tools.r8.origin.ArchiveEntryOrigin -> com.android.tools.r8.origin.ArchiveEntryOrigin:
@@ -71120,39 +71437,40 @@
     1:1:java.lang.String getDescriptor():72:72 -> getDescriptor
 com.android.tools.r8.references.Reference -> com.android.tools.r8.references.Reference:
     1:8:void <clinit>():27:34 -> <clinit>
-    1:1:com.android.tools.r8.references.TypeReference typeFromClass(java.lang.Class):61:61 -> a
-    1:1:com.android.tools.r8.references.ArrayReference array(com.android.tools.r8.references.TypeReference,int):103:103 -> array
-    1:1:com.android.tools.r8.references.ArrayReference arrayFromDescriptor(java.lang.String):98:98 -> arrayFromDescriptor
-    1:1:com.android.tools.r8.references.MethodReference classConstructor(com.android.tools.r8.references.ClassReference):161:161 -> classConstructor
-    1:1:com.android.tools.r8.references.ClassReference classFromBinaryName(java.lang.String):79:79 -> classFromBinaryName
-    1:1:com.android.tools.r8.references.ClassReference classFromClass(java.lang.Class):93:93 -> classFromClass
-    1:1:com.android.tools.r8.references.ClassReference classFromDescriptor(java.lang.String):70:70 -> classFromDescriptor
-    1:1:com.android.tools.r8.references.ClassReference classFromTypeName(java.lang.String):88:88 -> classFromTypeName
-    1:1:com.android.tools.r8.references.FieldReference field(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.references.TypeReference):167:167 -> field
-    1:4:com.android.tools.r8.references.FieldReference fieldFromField(java.lang.reflect.Field):172:175 -> fieldFromField
-    1:2:com.android.tools.r8.references.MethodReference method(com.android.tools.r8.references.ClassReference,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):112:113 -> method
-    1:11:com.android.tools.r8.references.MethodReference methodFromDescriptor(java.lang.String,java.lang.String,java.lang.String):147:157 -> methodFromDescriptor
-    12:12:com.android.tools.r8.references.MethodReference methodFromDescriptor(java.lang.String,java.lang.String,java.lang.String):153:153 -> methodFromDescriptor
-    1:13:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Method):118:130 -> methodFromMethod
-    14:14:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Method):126:126 -> methodFromMethod
-    15:21:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Constructor):135:141 -> methodFromMethod
-    1:1:com.android.tools.r8.references.PackageReference packageFromPackage(java.lang.Package):186:186 -> packageFromPackage
-    1:1:com.android.tools.r8.references.PackageReference packageFromString(java.lang.String):181:181 -> packageFromString
+    1:1:com.android.tools.r8.references.TypeReference typeFromClass(java.lang.Class):65:65 -> a
+    1:1:com.android.tools.r8.references.ArrayReference array(com.android.tools.r8.references.TypeReference,int):107:107 -> array
+    1:1:com.android.tools.r8.references.ArrayReference arrayFromDescriptor(java.lang.String):102:102 -> arrayFromDescriptor
+    1:1:com.android.tools.r8.references.MethodReference classConstructor(com.android.tools.r8.references.ClassReference):165:165 -> classConstructor
+    1:1:com.android.tools.r8.references.ClassReference classFromBinaryName(java.lang.String):83:83 -> classFromBinaryName
+    1:1:com.android.tools.r8.references.ClassReference classFromClass(java.lang.Class):97:97 -> classFromClass
+    1:1:com.android.tools.r8.references.ClassReference classFromDescriptor(java.lang.String):74:74 -> classFromDescriptor
+    1:1:com.android.tools.r8.references.ClassReference classFromTypeName(java.lang.String):92:92 -> classFromTypeName
+    1:1:com.android.tools.r8.references.FieldReference field(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.references.TypeReference):171:171 -> field
+    1:4:com.android.tools.r8.references.FieldReference fieldFromField(java.lang.reflect.Field):176:179 -> fieldFromField
+    1:2:com.android.tools.r8.references.MethodReference method(com.android.tools.r8.references.ClassReference,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):116:117 -> method
+    1:11:com.android.tools.r8.references.MethodReference methodFromDescriptor(java.lang.String,java.lang.String,java.lang.String):151:161 -> methodFromDescriptor
+    12:12:com.android.tools.r8.references.MethodReference methodFromDescriptor(java.lang.String,java.lang.String,java.lang.String):157:157 -> methodFromDescriptor
+    1:13:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Method):122:134 -> methodFromMethod
+    14:14:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Method):130:130 -> methodFromMethod
+    15:21:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Constructor):139:145 -> methodFromMethod
+    1:1:com.android.tools.r8.references.PackageReference packageFromPackage(java.lang.Package):190:190 -> packageFromPackage
+    1:1:com.android.tools.r8.references.PackageReference packageFromString(java.lang.String):185:185 -> packageFromString
     1:20:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):79:98 -> primitiveFromDescriptor
-    1:20:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):65 -> primitiveFromDescriptor
+    1:20:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):69 -> primitiveFromDescriptor
     21:33:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):82:94 -> primitiveFromDescriptor
-    21:33:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):65 -> primitiveFromDescriptor
+    21:33:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):69 -> primitiveFromDescriptor
     34:40:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):90:96 -> primitiveFromDescriptor
-    34:40:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):65 -> primitiveFromDescriptor
+    34:40:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):69 -> primitiveFromDescriptor
     41:41:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):86:86 -> primitiveFromDescriptor
-    41:41:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):65 -> primitiveFromDescriptor
+    41:41:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):69 -> primitiveFromDescriptor
     42:42:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):84:84 -> primitiveFromDescriptor
-    42:42:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):65 -> primitiveFromDescriptor
+    42:42:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):69 -> primitiveFromDescriptor
     1:1:com.android.tools.r8.references.TypeReference returnTypeFromDescriptor(java.lang.String):41:41 -> returnTypeFromDescriptor
-    1:7:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):45:51 -> typeFromDescriptor
-    8:8:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):49:49 -> typeFromDescriptor
-    9:9:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):47:47 -> typeFromDescriptor
-    1:1:com.android.tools.r8.references.TypeReference typeFromTypeName(java.lang.String):56:56 -> typeFromTypeName
+    1:1:com.android.tools.r8.references.TypeReference returnTypeFromTypeName(java.lang.String):45:45 -> returnTypeFromTypeName
+    1:7:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):49:55 -> typeFromDescriptor
+    8:8:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):53:53 -> typeFromDescriptor
+    9:9:com.android.tools.r8.references.TypeReference typeFromDescriptor(java.lang.String):51:51 -> typeFromDescriptor
+    1:1:com.android.tools.r8.references.TypeReference typeFromTypeName(java.lang.String):60:60 -> typeFromTypeName
 com.android.tools.r8.references.TypeReference -> com.android.tools.r8.references.TypeReference:
     1:1:java.lang.String getTypeName():62:62 -> getTypeName
 com.android.tools.r8.relocator.Relocator -> com.android.tools.r8.relocator.Relocator:
@@ -71284,7 +71602,7 @@
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):132:132 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
     1:1:java.lang.String lookupPackageName(java.lang.String):112:112 -> b
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.KA:
     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
@@ -71295,7 +71613,7 @@
     4:35:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):85:116 -> a
     36:46:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):110:120 -> a
     47:47:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):132:132 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1079:1079 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1082:1082 -> a
     48:48:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):132 -> a
     49:53:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):136:140 -> a
     54:68:void com.android.tools.r8.repackaging.Repackaging.processPackagesInDesiredLocation(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Set):204:218 -> a
@@ -71318,12 +71636,12 @@
     143:143: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):291:291 -> a
     144:144:boolean com.android.tools.r8.repackaging.Repackaging.isRepackageTypeUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.AppView):439:439 -> a
     144:144:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.AppView):59 -> a
-    145:145:boolean com.android.tools.r8.graph.AppView.hasLiveness():569:569 -> a
+    145:145:boolean com.android.tools.r8.graph.AppView.hasLiveness():579:579 -> a
     145:145:boolean com.android.tools.r8.repackaging.Repackaging.isRepackageTypeUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.AppView):440 -> a
     145:145:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.AppView):59 -> a
     146:146:boolean com.android.tools.r8.repackaging.Repackaging.isRepackageTypeUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.AppView):440:440 -> a
     146:146:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.AppView):59 -> a
-com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.iA:
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.JA:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():86:86 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):86:86 -> <init>
@@ -71331,7 +71649,7 @@
     2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):99:99 -> a
     3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:104 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.jA$a:
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.KA$a:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy packageMinificationStrategy -> d
@@ -71340,32 +71658,32 @@
     1:1:void <clinit>():321:321 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView):328:332 -> <init>
     1:5:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):337:341 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1087:1087 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1090:1090 -> a
     6:6:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):341 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1091:1091 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1094:1094 -> a
     7:7:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):343 -> a
     8:16:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):344:352 -> a
     17:22:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):349:354 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1083:1083 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1086:1086 -> a
     23:23:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):354 -> a
     24:29:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):354:359 -> a
     30:34:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):365:369 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1087:1087 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1090:1090 -> a
     35:35:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):369 -> a
     36:36:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):370:370 -> a
-    37:37:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1091:1091 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1094:1094 -> a
     37:37:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):371 -> a
     38:42:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):373:377 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1083:1083 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1086:1086 -> a
     43:43:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):377 -> a
     44:44:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):377:377 -> a
     45:67: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):409:431 -> a
     1:8:boolean mayHavePinnedPackagePrivateOrProtectedItem(com.android.tools.r8.graph.ProgramPackage):387:394 -> b
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.jA$b:
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.KA$b:
     java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set) -> a
     com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap) -> a
     boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage) -> a
-com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.kA:
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.LA:
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> g
     com.android.tools.r8.com.google.common.collect.BiMap mappings -> f
     boolean $assertionsDisabled -> h
@@ -71381,7 +71699,7 @@
     6:6:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
     6:6:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):193 -> a
     1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):178:178 -> b
-com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.jA$c:
+com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.KA$c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String classNameSuffix -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory):450:452 -> <init>
@@ -71389,7 +71707,7 @@
     1:1:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):458:458 -> a
     2:21:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):472:491 -> a
     22:22:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):490:490 -> a
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.lA:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.MA:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -71416,7 +71734,7 @@
     114:121:void traceDexValue(com.android.tools.r8.graph.DexValue):90:97 -> a
     122:123:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
     122:123:void traceDexValue(com.android.tools.r8.graph.DexValue):97 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.nA:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.OA:
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> e
     com.android.tools.r8.graph.ProgramPackage pkg -> b
     java.util.Map nodes -> c
@@ -71451,7 +71769,7 @@
     11:15:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):113:117 -> b
     11:15:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):82 -> b
     16:22:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):83:89 -> b
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.mA:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.NA:
     com.android.tools.r8.graph.DexDefinition definitionForDebugging -> a
     java.util.Set neighbors -> b
     1:1:void <init>(com.android.tools.r8.graph.DexDefinition):201:201 -> <init>
@@ -71459,7 +71777,7 @@
     1:2:void addNeighbor(com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):206:207 -> a
     3:3:java.util.Set getNeighbors():211:211 -> a
     1:1:java.lang.String toString():216:216 -> toString
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.qA:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.RA:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> n
     boolean $assertionsDisabled -> p
     java.util.Map packageRenamings -> o
@@ -71484,17 +71802,17 @@
     24:24:boolean com.android.tools.r8.repackaging.RepackagingLens.isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):70:70 -> a
     24:24:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):74 -> a
     25:28:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):77:80 -> a
-    29:39:boolean com.android.tools.r8.utils.IterableUtils.testPairs(java.util.function.BiPredicate,java.lang.Iterable,java.lang.Iterable):143:153 -> a
+    29:39:boolean com.android.tools.r8.utils.IterableUtils.testPairs(java.util.function.BiPredicate,java.lang.Iterable,java.lang.Iterable):147:157 -> a
     29:39:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):77 -> a
-com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.oA:
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.pA:
+com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.QA:
     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.rA:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.SA:
     com.android.tools.r8.graph.InitClassLens initClassLens -> g
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> c
     boolean $assertionsDisabled -> j
@@ -71583,81 +71901,80 @@
     com.android.tools.r8.retrace.StackTraceLineParser stackTraceLineParser -> a
     boolean $assertionsDisabled -> e
     boolean isVerbose -> d
-    1:5:void <clinit>():48:52 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.retrace.StackTraceLineParser,com.android.tools.r8.retrace.StackTraceElementProxyRetracer,com.android.tools.r8.DiagnosticsHandler,boolean):148:152 -> <init>
-    1:36:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):58:93 -> a
-    1:36:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    37:43:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):120:126 -> a
-    37:43:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):93 -> a
-    37:43:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    44:45:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):93:94 -> a
-    44:45:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    46:48:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):122:122 -> a
-    46:48:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):93 -> a
-    46:48:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    50:50:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):124:124 -> a
-    50:50:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):93 -> a
-    50:50:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    51:51:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):97:97 -> a
-    51:51:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    52:52:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):132:132 -> a
-    52:52:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):97 -> a
-    52:52:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    53:54:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):97:98 -> a
-    53:54:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    55:56:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):134:135 -> a
-    55:56:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):97 -> a
-    55:56:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    57:60:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):101:101 -> a
-    57:60:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    63:64:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):104:105 -> a
-    63:64:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    65:70:java.util.List getStackTraceFromStandardInput(boolean):323:328 -> a
-    65:70:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):113 -> a
-    65:70:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    71:71:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):113:113 -> a
-    71:71:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    72:91:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):290:309 -> a
-    92:93:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):109:110 -> a
-    92:93:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):287 -> a
-    94:96:void lambda$retraceStackTrace$0(java.lang.Object,int):166:166 -> a
-    98:98:void lambda$retraceStackTrace$0(java.lang.Object,int):168:168 -> a
-    99:99:void lambda$retraceStackTrace$1(java.util.function.Consumer,java.lang.Object):171:171 -> a
-    100:102:void lambda$retraceFrame$2(java.util.List,java.util.Map,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceProxy):188:190 -> a
-    103:103:java.lang.Object com.android.tools.r8.utils.ListUtils.last(java.util.List):62:62 -> a
-    103:103:void lambda$retraceFrame$2(java.util.List,java.util.Map,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceProxy):193 -> a
-    104:105:void lambda$retraceFrame$2(java.util.List,java.util.Map,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceProxy):193:194 -> a
-    106:106:void lambda$retraceFrame$3(java.util.List,java.util.Map,com.android.tools.r8.retrace.RetraceStackTraceProxy):198:198 -> a
-    107:108:java.lang.Object lambda$retraceLine$4(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceProxy):215:216 -> a
-    109:114:void lambda$run$5(com.android.tools.r8.DiagnosticsHandler,java.util.List):301:301 -> a
-    118:119:void lambda$run$5(com.android.tools.r8.DiagnosticsHandler,java.util.List):305:306 -> a
-    120:120:void lambda$main$6(java.lang.String[]):318:318 -> a
-    1:1:void main(java.lang.String[]):318:318 -> main
-    2:7:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):339:344 -> main
-    2:7:void main(java.lang.String[]):318 -> main
-    8:8:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):342:342 -> main
-    8:8:void main(java.lang.String[]):318 -> main
-    1:18:java.util.List retraceFrame(java.lang.Object):181:198 -> retraceFrame
-    1:9:java.util.List retraceLine(java.lang.Object):210:218 -> retraceLine
-    1:1:void retraceStackTrace(java.util.List,java.util.function.Consumer):162:162 -> retraceStackTrace
+    1:5:void <clinit>():49:53 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.retrace.StackTraceLineParser,com.android.tools.r8.retrace.StackTraceElementProxyRetracer,com.android.tools.r8.DiagnosticsHandler,boolean):149:153 -> <init>
+    1:36:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):59:94 -> a
+    1:36:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    37:43:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):121:127 -> a
+    37:43:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):94 -> a
+    37:43:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    44:45:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):94:95 -> a
+    44:45:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    46:48:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):123:123 -> a
+    46:48:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):94 -> a
+    46:48:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    50:50:com.android.tools.r8.retrace.ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):125:125 -> a
+    50:50:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):94 -> a
+    50:50:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    51:51:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):98:98 -> a
+    51:51:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    52:52:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):133:133 -> a
+    52:52:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):98 -> a
+    52:52:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    53:54:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):98:99 -> a
+    53:54:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    55:56:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):135:136 -> a
+    55:56:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):98 -> a
+    55:56:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    57:60:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):102:102 -> a
+    57:60:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    63:64:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):105:106 -> a
+    63:64:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    65:70:java.util.List getStackTraceFromStandardInput(boolean):336:341 -> a
+    65:70:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):114 -> a
+    65:70:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    71:71:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):114:114 -> a
+    71:71:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    72:91:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):303:322 -> a
+    92:93:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):110:111 -> a
+    92:93:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):300 -> a
+    94:96:void lambda$retraceStackTrace$0(java.lang.Object,int):167:167 -> a
+    98:98:void lambda$retraceStackTrace$0(java.lang.Object,int):169:169 -> a
+    99:99:void lambda$retraceStackTrace$1(java.util.function.Consumer,java.lang.Object):172:172 -> a
+    100:106:void lambda$retraceFrame$2(java.util.List,java.util.Map,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceProxy):189:195 -> a
+    107:107:void lambda$retraceFrame$3(java.util.List,java.util.Map,com.android.tools.r8.retrace.RetraceStackTraceProxy):199:199 -> a
+    108:109:java.lang.Object lambda$retraceLine$4(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceProxy):216:217 -> a
+    110:120:void runForTesting(com.android.tools.r8.retrace.RetraceCommand,boolean):235:245 -> a
+    121:144:void runForTesting(com.android.tools.r8.retrace.RetraceCommand,boolean):243:266 -> a
+    145:150:void lambda$run$5(com.android.tools.r8.DiagnosticsHandler,java.util.List):314:314 -> a
+    154:155:void lambda$run$5(com.android.tools.r8.DiagnosticsHandler,java.util.List):318:319 -> a
+    156:156:void lambda$main$6(java.lang.String[]):331:331 -> a
+    1:1:void main(java.lang.String[]):331:331 -> main
+    2:7:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):352:357 -> main
+    2:7:void main(java.lang.String[]):331 -> main
+    8:8:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):355:355 -> main
+    8:8:void main(java.lang.String[]):331 -> main
+    1:18:java.util.List retraceFrame(java.lang.Object):182:199 -> retraceFrame
+    1:9:java.util.List retraceLine(java.lang.Object):211:219 -> retraceLine
+    1:1:void retraceStackTrace(java.util.List,java.util.function.Consumer):163:163 -> retraceStackTrace
     2:3:void com.android.tools.r8.utils.ListUtils.forEachWithIndex(java.util.List,com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer):169:170 -> retraceStackTrace
-    2:3:void retraceStackTrace(java.util.List,java.util.function.Consumer):162 -> retraceStackTrace
-    4:4:void retraceStackTrace(java.util.List,java.util.function.Consumer):171:171 -> retraceStackTrace
-    1:26:void run(com.android.tools.r8.retrace.RetraceCommand):228:253 -> run
-    27:40:void run(java.lang.String[]):259:272 -> run
-    41:58:void run(java.lang.String[]):264:281 -> run
+    2:3:void retraceStackTrace(java.util.List,java.util.function.Consumer):163 -> retraceStackTrace
+    4:4:void retraceStackTrace(java.util.List,java.util.function.Consumer):172:172 -> retraceStackTrace
+    1:2:void run(com.android.tools.r8.retrace.RetraceCommand):229:230 -> run
+    3:16:void run(java.lang.String[]):272:285 -> run
+    17:34:void run(java.lang.String[]):277:294 -> run
 com.android.tools.r8.retrace.Retrace$1 -> com.android.tools.r8.retrace.Retrace$a:
-    1:1:void <init>():277:277 -> <init>
+    1:1:void <init>():290:290 -> <init>
 com.android.tools.r8.retrace.Retrace$MainAction -> com.android.tools.r8.retrace.Retrace$b:
 com.android.tools.r8.retrace.Retrace$RetraceDiagnosticsHandler -> com.android.tools.r8.retrace.Retrace$c:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> a
     boolean printInfo -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():348:348 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.DiagnosticsHandler,boolean):353:355 -> <init>
-    1:1:void error(com.android.tools.r8.Diagnostic):361:361 -> error
-    1:2:void info(com.android.tools.r8.Diagnostic):371:372 -> info
-    1:1:void warning(com.android.tools.r8.Diagnostic):366:366 -> warning
+    1:1:void <clinit>():361:361 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.DiagnosticsHandler,boolean):366:368 -> <init>
+    1:1:void error(com.android.tools.r8.Diagnostic):374:374 -> error
+    1:2:void info(com.android.tools.r8.Diagnostic):384:385 -> info
+    1:1:void warning(com.android.tools.r8.Diagnostic):379:379 -> warning
 com.android.tools.r8.retrace.RetraceCommand -> com.android.tools.r8.retrace.RetraceCommand:
     java.util.List stackTrace -> a
     com.android.tools.r8.retrace.RetraceOptions options -> c
@@ -71698,6 +72015,8 @@
 com.android.tools.r8.retrace.RetraceFailedException -> com.android.tools.r8.retrace.RetraceFailedException:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):21:21 -> <init>
+com.android.tools.r8.retrace.RetraceHelper -> com.android.tools.r8.retrace.a:
+    1:1:void runForTesting(com.android.tools.r8.retrace.RetraceCommand,boolean):10:10 -> a
 com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics -> com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics:
     java.lang.String message -> b
     int lineNumber -> a
@@ -71741,10 +72060,6 @@
     1:1:boolean isAmbiguous():27:27 -> isAmbiguous
 com.android.tools.r8.retrace.Retracer -> com.android.tools.r8.retrace.Retracer:
     1:1:com.android.tools.r8.retrace.Retracer createDefault(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):31:31 -> createDefault
-    2:9:com.android.tools.r8.retrace.internal.RetracerImpl com.android.tools.r8.retrace.internal.RetracerImpl.create(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):33:40 -> createDefault
-    2:9:com.android.tools.r8.retrace.Retracer createDefault(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):31 -> createDefault
-    10:14:com.android.tools.r8.retrace.internal.RetracerImpl com.android.tools.r8.retrace.internal.RetracerImpl.create(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):39:43 -> createDefault
-    10:14:com.android.tools.r8.retrace.Retracer createDefault(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler):31 -> createDefault
 com.android.tools.r8.retrace.StackTraceElementProxy -> com.android.tools.r8.retrace.StackTraceElementProxy:
     1:1:void <init>():11:11 -> <init>
 com.android.tools.r8.retrace.StackTraceElementProxyRetracer -> com.android.tools.r8.retrace.StackTraceElementProxyRetracer:
@@ -71756,21 +72071,21 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.retrace.StackTraceLineParser,com.android.tools.r8.retrace.StackTraceElementProxyRetracer,com.android.tools.r8.DiagnosticsHandler,boolean):30:30 -> <init>
     1:1:void lambda$retrace$0(java.util.List,java.util.List):58:58 -> a
-    2:15:void joinAmbiguousLines(java.util.List,java.util.function.Consumer):76:89 -> a
-    16:21:void lambda$joinAmbiguousLines$1(java.util.function.Consumer,java.lang.String):91:96 -> a
+    2:18:void joinAmbiguousLines(java.util.List,java.util.function.Consumer):76:92 -> a
+    19:24:void lambda$joinAmbiguousLines$1(java.util.function.Consumer,java.lang.String):94:99 -> a
     1:6:com.android.tools.r8.retrace.StringRetrace create(com.android.tools.r8.retrace.RetraceOptions):41:46 -> create
     1:2:java.util.List retrace(java.util.List):57:58 -> retrace
     3:4:java.util.List retrace(java.lang.String):69:70 -> retrace
-com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.E9:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.F9:
 # {"id":"sourceFile","fileName":"Definition.java"}
-com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.Ea:
+com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.Fa:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
-com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.vc:
+com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.wc:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
     1:1:com.android.tools.r8.retrace.internal.FieldDefinition create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
-com.android.tools.r8.retrace.internal.FieldDefinition$1 -> com.android.tools.r8.internal.sc:
-com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.retrace.internal.FieldDefinition$1 -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.uc:
     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>
@@ -71780,7 +72095,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.uc:
+com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.vc:
     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>
@@ -71794,14 +72109,14 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():82:82 -> getHolderClass
     1:1:java.lang.String getName():77:77 -> getName
     1:1:int hashCode():105:105 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.sr:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition asFullMethodDefinition() -> a
     com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
     2:2:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.MethodReference):20:20 -> a
-com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.Wq:
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.Xq:
+com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.qr:
     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>
@@ -71811,7 +72126,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.Yq:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.rr:
     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>
@@ -71824,7 +72139,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.PlainStackTraceLineParser -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.retrace.internal.PlainStackTraceLineParser -> com.android.tools.r8.internal.Rv:
     1:1:void <init>():18:18 -> <init>
     1:1:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):15:15 -> parse
     2:58:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.PlainStackTraceLineParser$AtLine.tryParse(java.lang.String):92:148 -> parse
@@ -71844,249 +72159,246 @@
     100:100:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.PlainStackTraceLineParser.parseLine(java.lang.String):197:197 -> parse
     100:100:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.PlainStackTraceLineParser.parse(java.lang.String):22 -> parse
     100:100:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):15 -> parse
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.CA:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.dB:
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.FA:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.gB:
     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>():29:29 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):36:39 -> <init>
-    1:1:com.android.tools.r8.references.ClassReference access$100(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):29:29 -> a
-    2:2:java.util.List access$300(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.MethodDefinition,int):29:29 -> a
-    3:3: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):44:44 -> a
-    4:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):53:53 -> a
-    5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):76:76 -> a
-    6:7:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):79:80 -> a
-    8:8:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):89:89 -> a
-    9:9:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):105:105 -> a
-    10:10:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():181:181 -> a
-    10:10:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):106 -> a
-    11:24:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):106:119 -> a
-    25:33:void lambda$lookup$2(java.util.function.BiFunction,com.android.tools.r8.retrace.internal.Definition,java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):109:117 -> a
-    34:34:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):142:142 -> a
-    35:35:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():181:181 -> a
-    35:35:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):143 -> a
-    36:41:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):143:148 -> a
-    42:44:void lambda$lookupFrame$3(java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,int,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):146:146 -> a
-    45:58:java.util.List getMappedRangesForFrame(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.MethodDefinition,int):153:166 -> a
-    59:64:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl createElement():185:190 -> a
-    65:65:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl createElement():187:187 -> a
-    1:1:com.android.tools.r8.retrace.internal.RetracerImpl access$200(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):29:29 -> b
-    2:2:com.android.tools.r8.retrace.internal.RetracerImpl getRetracerImpl():48:48 -> b
-    3:3:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(java.lang.String):64:64 -> b
-    4:8:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):92:96 -> b
-    1:1:boolean hasRetraceResult():172:172 -> hasRetraceResult
-    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String):53:53 -> lookupField
-    1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):29 -> lookupField
-    2:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):58:59 -> lookupField
-    2:3:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):29 -> lookupField
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):35:38 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$100(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):28:28 -> a
+    2:2:java.util.List access$400(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.MethodDefinition,int):28:28 -> a
+    3:3: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):43:43 -> a
+    4:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):52:52 -> a
+    5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):75:75 -> a
+    6:7:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):78:79 -> a
+    8:8:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):88:88 -> a
+    9:9:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):104:104 -> a
+    10:10:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():180:180 -> a
+    10:10:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):105 -> a
+    11:24:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):105:118 -> a
+    25:33:void lambda$lookup$2(java.util.function.BiFunction,com.android.tools.r8.retrace.internal.Definition,java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):108:116 -> a
+    34:34:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):141:141 -> a
+    35:35:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():180:180 -> a
+    35:35:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):142 -> a
+    36:41:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):142:147 -> a
+    42:44:void lambda$lookupFrame$3(java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,int,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):145:145 -> a
+    45:58:java.util.List getMappedRangesForFrame(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.MethodDefinition,int):152:165 -> a
+    59:64:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl createElement():184:189 -> a
+    65:65:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl createElement():186:186 -> a
+    1:1:com.android.tools.r8.references.ClassReference access$200(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):28:28 -> b
+    2:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(java.lang.String):63:63 -> b
+    3:7:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):91:95 -> b
+    1:1:com.android.tools.r8.retrace.internal.RetracerImpl access$300(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):28:28 -> c
+    1:1:boolean hasRetraceResult():171:171 -> hasRetraceResult
+    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String):52:52 -> lookupField
+    1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):28 -> lookupField
+    2:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):57:58 -> lookupField
+    2:3:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):28 -> lookupField
     4:4:com.android.tools.r8.retrace.internal.FieldDefinition com.android.tools.r8.retrace.internal.FieldDefinition.create(com.android.tools.r8.references.FieldReference):20:20 -> lookupField
-    4:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):59 -> lookupField
-    4:4:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):29 -> lookupField
-    5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):58:58 -> lookupField
-    5:5:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):29 -> lookupField
-    1:1:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String):124:124 -> lookupFrame
-    1:1:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String):29 -> lookupFrame
-    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int):129:129 -> lookupFrame
-    2:2:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int):29 -> lookupFrame
-    3:5:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):135:137 -> lookupFrame
-    3:5:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupFrame
-    6:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):136:136 -> lookupFrame
-    6:6:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupFrame
-    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):135:135 -> lookupFrame
-    7:7:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupFrame
-    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String):64:64 -> lookupMethod
-    1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):29 -> lookupMethod
-    2:4:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):70:72 -> lookupMethod
-    2:4:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupMethod
-    5:5:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):71:71 -> lookupMethod
-    5:5:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupMethod
-    6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):70:70 -> lookupMethod
-    6:6:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupMethod
-    1:1:java.util.stream.Stream stream():177:177 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.DA:
+    4:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):58 -> lookupField
+    4:4:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):28 -> lookupField
+    5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):57:57 -> lookupField
+    5:5:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String,com.android.tools.r8.references.TypeReference):28 -> lookupField
+    1:1:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String):123:123 -> lookupFrame
+    1:1:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String):28 -> lookupFrame
+    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int):128:128 -> lookupFrame
+    2:2:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int):28 -> lookupFrame
+    3:5:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):134:136 -> lookupFrame
+    3:5:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):28 -> lookupFrame
+    6:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):135:135 -> lookupFrame
+    6:6:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):28 -> lookupFrame
+    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):134:134 -> lookupFrame
+    7:7:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):28 -> lookupFrame
+    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String):63:63 -> lookupMethod
+    1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):28 -> lookupMethod
+    2:4:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):69:71 -> lookupMethod
+    2:4:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):28 -> lookupMethod
+    5:5:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):70:70 -> lookupMethod
+    5:5:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):28 -> lookupMethod
+    6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):69:69 -> lookupMethod
+    6:6:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):28 -> lookupMethod
+    1:1:java.util.stream.Stream stream():176:176 -> stream
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.eB:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.Retracer) -> a
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.fB:
     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
-    1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl,com.android.tools.r8.naming.ClassNamingForNameMapper):211:214 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$000(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):202:202 -> a
-    2:2:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl getRetracedClass():219:219 -> a
-    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):253:253 -> a
-    4:5:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):256:257 -> a
-    6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):271:271 -> a
-    7:17:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):287:297 -> a
-    18:24:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):325:331 -> a
-    25:30:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):329:334 -> a
-    1:5:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):274:278 -> b
-    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetraceResultContext():224:224 -> getRetraceResultContext
-    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():202 -> getRetraceResultContext
-    1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetracedClass():219:219 -> getRetracedClass
-    1:1:com.android.tools.r8.retrace.RetracedClassReference getRetracedClass():202 -> getRetracedClass
-    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):249:249 -> lookupField
-    1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):202 -> lookupField
-    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(java.lang.String,int):307:307 -> lookupFrame
-    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(java.lang.String):302 -> lookupFrame
-    1:3:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String):202 -> lookupFrame
-    4:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(java.lang.String,int):307:307 -> lookupFrame
-    4:6:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int):202 -> lookupFrame
-    7:10:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):317:320 -> lookupFrame
-    11:11:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):319:319 -> lookupFrame
-    12:12:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):318:318 -> lookupFrame
-    13:13:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):317:317 -> lookupFrame
-    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):267:267 -> lookupMethod
-    1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):202 -> lookupMethod
-    1:4:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):230:233 -> retraceSourceFile
-    1:4:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):202 -> retraceSourceFile
-    5:5:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):232:232 -> retraceSourceFile
-    5:5:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):202 -> retraceSourceFile
-    6:10:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):230:234 -> retraceSourceFile
-    6:10:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):202 -> retraceSourceFile
-    11:11:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isFileNameInformation():0:0 -> retraceSourceFile
-    11:11:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):234 -> retraceSourceFile
-    11:11:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):202 -> retraceSourceFile
-    12:18:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):235:241 -> retraceSourceFile
-    12:18:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):202 -> retraceSourceFile
-    19:19:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):239:239 -> retraceSourceFile
-    19:19:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):202 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.IA:
+    1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl,com.android.tools.r8.naming.ClassNamingForNameMapper):210:213 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$000(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):201:201 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl getRetracedClass():218:218 -> a
+    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):263:263 -> a
+    4:5:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):266:267 -> a
+    6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):281:281 -> a
+    7:17:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):297:307 -> a
+    18:24:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):335:341 -> a
+    25:30:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):339:344 -> a
+    1:5:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):284:288 -> b
+    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetraceResultContext():223:223 -> getRetraceResultContext
+    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():201 -> getRetraceResultContext
+    1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetracedClass():218:218 -> getRetracedClass
+    1:1:com.android.tools.r8.retrace.RetracedClassReference getRetracedClass():201 -> getRetracedClass
+    1:3:boolean isCompilerSynthesized():228:230 -> isCompilerSynthesized
+    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):259:259 -> lookupField
+    1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):201 -> lookupField
+    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(java.lang.String,int):317:317 -> lookupFrame
+    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(java.lang.String):312 -> lookupFrame
+    1:3:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String):201 -> lookupFrame
+    4:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(java.lang.String,int):317:317 -> lookupFrame
+    4:6:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int):201 -> lookupFrame
+    7:10:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):327:330 -> lookupFrame
+    11:11:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):329:329 -> lookupFrame
+    12:12:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):328:328 -> lookupFrame
+    13:13:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):327:327 -> lookupFrame
+    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):277:277 -> lookupMethod
+    1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):201 -> lookupMethod
+    1:3:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):240:242 -> retraceSourceFile
+    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):201 -> retraceSourceFile
+    4:4:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isFileNameInformation():0:0 -> retraceSourceFile
+    4:4:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):242 -> retraceSourceFile
+    4:4:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):201 -> retraceSourceFile
+    5:13:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):243:251 -> retraceSourceFile
+    5:13:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):201 -> retraceSourceFile
+    14:14:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):249:249 -> retraceSourceFile
+    14:14:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):201 -> retraceSourceFile
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.jB:
     java.util.List memberNamings -> a
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     com.android.tools.r8.retrace.Retracer retracer -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.Retracer):31:37 -> <init>
-    1:1:com.android.tools.r8.retrace.Retracer access$000(com.android.tools.r8.retrace.internal.RetraceFieldResultImpl):20:20 -> a
-    2:11:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):45:54 -> a
-    12:12:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):53:53 -> a
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.Retracer):32:38 -> <init>
+    1:1:com.android.tools.r8.retrace.Retracer access$000(com.android.tools.r8.retrace.internal.RetraceFieldResultImpl):21:21 -> a
+    2:11:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):46:55 -> a
+    12:12:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):54:54 -> a
     13:13:com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl.create(com.android.tools.r8.retrace.internal.FieldDefinition):129:129 -> a
-    13:13:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):52 -> a
-    14:14:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):52:52 -> a
-    15:24:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):48:57 -> a
-    25:31:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):60:66 -> a
-    32:32:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):65:65 -> a
-    33:33:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):64:64 -> a
-    34:48:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):63:77 -> a
-    49:49:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):72:72 -> a
+    13:13:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):53 -> a
+    14:14:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):53:53 -> a
+    15:24:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):49:58 -> a
+    25:31:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):61:67 -> a
+    32:32:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):66:66 -> a
+    33:33:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):65:65 -> a
+    34:48:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):64:78 -> a
+    49:49:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):73:73 -> a
     50:50:com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl.create(com.android.tools.r8.references.FieldReference):125:125 -> a
-    50:50:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):71 -> a
-    51:51:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):71:71 -> a
-    1:8:boolean isAmbiguous():84:91 -> isAmbiguous
-    1:2:java.util.stream.Stream stream():42:43 -> stream
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.GA:
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.HA:
+    50:50:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):72 -> a
+    51:51:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):72:72 -> a
+    1:8:boolean isAmbiguous():85:92 -> isAmbiguous
+    1:2:java.util.stream.Stream stream():43:44 -> stream
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.hB:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.iB:
     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
-    1:1:void <init>(com.android.tools.r8.retrace.internal.RetraceFieldResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl,com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1):94:94 -> <init>
-    2:5:void <init>(com.android.tools.r8.retrace.internal.RetraceFieldResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl):103:106 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl.getClassElement():126:126 -> getClassElement
-    1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():94 -> getClassElement
-    1:1:com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl.getField():116:116 -> getField
-    1:1:com.android.tools.r8.retrace.RetracedFieldReference getField():94 -> getField
-    1:1:com.android.tools.r8.retrace.RetraceFieldResult com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl.getRetraceResultContext():121:121 -> getRetraceResultContext
-    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():94 -> getRetraceResultContext
-    1:1:boolean isUnknown():111:111 -> isUnknown
-    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):131:131 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.KA:
+    1:1:void <init>(com.android.tools.r8.retrace.internal.RetraceFieldResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl,com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1):95:95 -> <init>
+    2:5:void <init>(com.android.tools.r8.retrace.internal.RetraceFieldResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl):104:107 -> <init>
+    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl.getClassElement():132:132 -> getClassElement
+    1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():95 -> getClassElement
+    1:1:com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl.getField():122:122 -> getField
+    1:1:com.android.tools.r8.retrace.RetracedFieldReference getField():95 -> getField
+    1:1:com.android.tools.r8.retrace.RetraceFieldResult com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl.getRetraceResultContext():127:127 -> getRetraceResultContext
+    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():95 -> getRetraceResultContext
+    1:1:boolean isCompilerSynthesized():112:112 -> isCompilerSynthesized
+    1:1:boolean isUnknown():117:117 -> isUnknown
+    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):137:137 -> retraceSourceFile
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.lB:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     java.util.List mappedRanges -> c
     com.android.tools.r8.retrace.Retracer retracer -> d
     int obfuscatedPosition -> b
-    1:6:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,int,com.android.tools.r8.retrace.Retracer):41:46 -> <init>
-    1:1:com.android.tools.r8.retrace.Retracer access$000(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl):28:28 -> a
-    2:2:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl access$100(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl,com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):28:28 -> a
-    3:25:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):74:96 -> a
-    26:33:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):95:102 -> a
-    34:40:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):77:83 -> a
-    41:41:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):82:82 -> a
-    42:45:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):81:84 -> a
-    46:46:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):77:77 -> a
-    47:50:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):108:111 -> a
-    51:56:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):110:115 -> a
-    57:57:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):122:122 -> a
-    58:63:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():431:436 -> a
-    58:63:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):123 -> a
-    64:71:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):124:131 -> a
-    72:72:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):130:130 -> a
+    1:6:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,int,com.android.tools.r8.retrace.Retracer):42:47 -> <init>
+    1:1:com.android.tools.r8.retrace.Retracer access$000(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl):29:29 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl access$100(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl,com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):29:29 -> a
+    3:25:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):75:97 -> a
+    26:33:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):96:103 -> a
+    34:40:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):78:84 -> a
+    41:41:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):83:83 -> a
+    42:45:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):82:85 -> a
+    46:46:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.utils.Pair):78:78 -> a
+    47:50:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):109:112 -> a
+    51:56:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):111:116 -> a
+    57:57:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):123:123 -> a
+    58:63:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():485:490 -> a
+    58:63:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):124 -> a
+    64:71:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):125:132 -> a
+    72:72:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):131:131 -> a
     73:73:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl.create(com.android.tools.r8.references.MethodReference):190:190 -> a
-    73:73:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):128 -> a
-    1:12:boolean isAmbiguous():51:62 -> isAmbiguous
-    1:2:java.util.stream.Stream stream():71:72 -> stream
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.JA:
+    73:73:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):129 -> a
+    1:12:boolean isAmbiguous():52:63 -> isAmbiguous
+    1:2:java.util.stream.Stream stream():72:73 -> stream
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.kB:
     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
     java.util.List mappedRanges -> d
     int obfuscatedPosition -> e
-    1:6:void <init>(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl,java.util.List,int):147:152 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getClassElement():172:172 -> getClassElement
-    1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():134 -> getClassElement
-    1:9:java.util.List getOuterFrames():193:201 -> getOuterFrames
-    10:13:java.util.List getOuterFrames():200:203 -> getOuterFrames
-    14:14:java.util.List getOuterFrames():202:202 -> getOuterFrames
-    1:1:com.android.tools.r8.retrace.RetraceFrameResult com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getRetraceResultContext():157:157 -> getRetraceResultContext
-    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():134 -> getRetraceResultContext
-    1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getTopFrame():167:167 -> getTopFrame
-    1:1:com.android.tools.r8.retrace.RetracedMethodReference getTopFrame():134 -> getTopFrame
-    1:1:boolean isUnknown():162:162 -> isUnknown
-    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(com.android.tools.r8.retrace.RetracedClassMemberReference,java.lang.String):187:187 -> retraceSourceFile
-    1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getTopFrame():167:167 -> visitFrames
-    1:1:void visitFrames(java.util.function.BiConsumer):178 -> visitFrames
-    2:2:void visitFrames(java.util.function.BiConsumer):178:178 -> visitFrames
-    3:11:java.util.List com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getOuterFrames():193:201 -> visitFrames
-    3:11:void visitFrames(java.util.function.BiConsumer):179 -> visitFrames
-    12:15:java.util.List com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getOuterFrames():200:203 -> visitFrames
-    12:15:void visitFrames(java.util.function.BiConsumer):179 -> visitFrames
-    16:16:java.util.List com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getOuterFrames():202:202 -> visitFrames
-    16:16:void visitFrames(java.util.function.BiConsumer):179 -> visitFrames
-    17:18:void visitFrames(java.util.function.BiConsumer):179:180 -> visitFrames
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.NA:
+    1:6:void <init>(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl,java.util.List,int):148:153 -> <init>
+    1:4:boolean isOuterMostFrameCompilerSynthesized():157:160 -> a
+    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getClassElement():190:190 -> getClassElement
+    1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():135 -> getClassElement
+    1:9:java.util.List getOuterFrames():227:235 -> getOuterFrames
+    10:13:java.util.List getOuterFrames():234:237 -> getOuterFrames
+    14:14:java.util.List getOuterFrames():236:236 -> getOuterFrames
+    1:1:com.android.tools.r8.retrace.RetraceFrameResult com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getRetraceResultContext():175:175 -> getRetraceResultContext
+    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():135 -> getRetraceResultContext
+    1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getTopFrame():185:185 -> getTopFrame
+    1:1:com.android.tools.r8.retrace.RetracedMethodReference getTopFrame():135 -> getTopFrame
+    1:1:boolean isCompilerSynthesized():170:170 -> isCompilerSynthesized
+    1:1:boolean isUnknown():180:180 -> isUnknown
+    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(com.android.tools.r8.retrace.RetracedClassMemberReference,java.lang.String):221:221 -> retraceSourceFile
+    1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getTopFrame():185:185 -> visitAllFrames
+    1:1:void visitAllFrames(java.util.function.BiConsumer):196 -> visitAllFrames
+    2:4:void visitAllFrames(java.util.function.BiConsumer):196:198 -> visitAllFrames
+    1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getTopFrame():185:185 -> visitNonCompilerSynthesizedFrames
+    1:1:void visitNonCompilerSynthesizedFrames(java.util.function.BiConsumer):206 -> visitNonCompilerSynthesizedFrames
+    2:9:void visitNonCompilerSynthesizedFrames(java.util.function.BiConsumer):207:214 -> visitNonCompilerSynthesizedFrames
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.oB:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> b
     java.util.List mappedRanges -> c
     com.android.tools.r8.retrace.Retracer retracer -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,com.android.tools.r8.retrace.Retracer):32:38 -> <init>
-    1:1:com.android.tools.r8.retrace.Retracer access$000(com.android.tools.r8.retrace.internal.RetraceMethodResultImpl):21:21 -> a
-    2:30:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl narrowByPosition(int):63:91 -> a
-    31:43:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):102:114 -> a
-    44:50:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):105:111 -> a
-    51:51:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):110:110 -> a
-    52:52:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):109:109 -> a
-    53:53:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):105:105 -> a
-    54:54:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):118:118 -> a
-    55:57:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):117:119 -> a
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,com.android.tools.r8.retrace.Retracer):33:39 -> <init>
+    1:1:com.android.tools.r8.retrace.Retracer access$000(com.android.tools.r8.retrace.internal.RetraceMethodResultImpl):22:22 -> a
+    2:30:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl narrowByPosition(int):64:92 -> a
+    31:43:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):103:115 -> a
+    44:50:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):106:112 -> a
+    51:51:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):111:111 -> a
+    52:52:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):110:110 -> a
+    53:53:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):106:106 -> a
+    54:54:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):119:119 -> a
+    55:57:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):118:120 -> a
     58:58:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl.create(com.android.tools.r8.references.MethodReference):190:190 -> a
-    58:58:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):122 -> a
-    59:59:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):122:122 -> a
-    1:12:boolean isAmbiguous():43:54 -> isAmbiguous
-    1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(int):21:21 -> narrowByPosition
-    1:2:java.util.stream.Stream stream():99:100 -> stream
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.LA:
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.MA:
+    58:58:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):123 -> a
+    59:59:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):123:123 -> a
+    1:12:boolean isAmbiguous():44:55 -> isAmbiguous
+    1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(int):22:22 -> narrowByPosition
+    1:2:java.util.stream.Stream stream():100:101 -> stream
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.mB:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.nB:
     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
-    1:1:void <init>(com.android.tools.r8.retrace.internal.RetraceMethodResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl,com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1):127:127 -> <init>
-    2:5:void <init>(com.android.tools.r8.retrace.internal.RetraceMethodResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl):136:139 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl.getClassElement():159:159 -> getClassElement
-    1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():127 -> getClassElement
-    1:1:com.android.tools.r8.retrace.RetraceMethodResult com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl.getRetraceResultContext():154:154 -> getRetraceResultContext
-    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():127 -> getRetraceResultContext
-    1:1:boolean isUnknown():144:144 -> isUnknown
-    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):165:165 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl -> com.android.tools.r8.internal.OA:
+    1:1:void <init>(com.android.tools.r8.retrace.internal.RetraceMethodResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl,com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1):128:128 -> <init>
+    2:5:void <init>(com.android.tools.r8.retrace.internal.RetraceMethodResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl):137:140 -> <init>
+    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl.getClassElement():165:165 -> getClassElement
+    1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():128 -> getClassElement
+    1:1:com.android.tools.r8.retrace.RetraceMethodResult com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl.getRetraceResultContext():160:160 -> getRetraceResultContext
+    1:1:com.android.tools.r8.retrace.RetraceResult getRetraceResultContext():128 -> getRetraceResultContext
+    1:1:boolean isCompilerSynthesized():145:145 -> isCompilerSynthesized
+    1:1:boolean isUnknown():150:150 -> isUnknown
+    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):171:171 -> retraceSourceFile
+com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl -> com.android.tools.r8.internal.pB:
     java.lang.String filename -> a
     boolean synthesized -> b
     1:3:void <init>(java.lang.String,boolean):14:16 -> <init>
     1:1:java.lang.String getFilename():26:26 -> getFilename
     1:1:boolean isSynthesized():21:21 -> isSynthesized
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.QA:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.rB:
     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>
@@ -72097,11 +72409,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.PA:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.qB:
     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.RetraceUtils -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.sB:
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():31:33 -> <clinit>
@@ -72124,7 +72436,7 @@
     61:61:int firstCharFromIndex(java.lang.String,int,char):154:154 -> a
     62:62:boolean lambda$firstCharFromIndex$1(char,java.lang.Character):154:154 -> a
     63:68:int firstFromIndex(java.lang.String,int,java.util.function.Predicate):158:163 -> a
-com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.SA:
+com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.tB:
     com.android.tools.r8.references.ClassReference classReference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -72137,12 +72449,12 @@
     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.WA:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.xB:
     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$1 -> com.android.tools.r8.internal.TA:
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1 -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.vB:
     com.android.tools.r8.references.FieldReference fieldReference -> a
     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>
@@ -72153,7 +72465,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.VA:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.wB:
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> a
     1:1:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition):92:93 -> <init>
@@ -72162,7 +72474,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.aB:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.BB:
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1):16:16 -> <init>
     2:2:void <init>():20:20 -> <init>
     1:6:int compareTo(com.android.tools.r8.retrace.RetracedMethodReference):39:44 -> a
@@ -72181,8 +72493,8 @@
     43:43:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl create(com.android.tools.r8.references.MethodReference,int):194:194 -> a
     1:1:int com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl.compareTo(java.lang.Object):58:58 -> compareTo
     1:1:boolean isKnown():29:29 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1 -> com.android.tools.r8.internal.XA:
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1 -> com.android.tools.r8.internal.yB:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.zB:
     com.android.tools.r8.references.MethodReference methodReference -> a
     int position -> b
     boolean $assertionsDisabled -> c
@@ -72201,7 +72513,7 @@
     1:1:boolean hasPosition():97:97 -> hasPosition
     1:1:int hashCode():135:135 -> hashCode
     1:1:boolean isVoid():77:77 -> isVoid
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.AB:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     int position -> b
     1:1:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,int,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1):139:139 -> <init>
@@ -72212,7 +72524,7 @@
     1:1:boolean com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl.hasPosition():161:161 -> getOriginalPositionOrDefault
     1:1:int getOriginalPositionOrDefault(int):166 -> getOriginalPositionOrDefault
     1:1:boolean hasPosition():161:161 -> hasPosition
-com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.bB:
+com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.CB:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -72228,25 +72540,25 @@
     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.cB:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.DB:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     boolean $assertionsDisabled -> b
-    int $r8$clinit -> c
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.naming.ClassNameMapper):26:28 -> <init>
-    1:3:com.android.tools.r8.retrace.internal.RetraceClassResultImpl retraceClass(com.android.tools.r8.references.ClassReference):67:67 -> a
-    4:4:java.util.Collection getAdditionalMappingInfo(com.android.tools.r8.naming.mappinginformation.ScopeReference):77:77 -> a
-    1:3:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceClass(com.android.tools.r8.references.ClassReference):67:67 -> retraceClass
-    1:3:com.android.tools.r8.retrace.RetraceClassResult retraceClass(com.android.tools.r8.references.ClassReference):22 -> retraceClass
-    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceField(com.android.tools.r8.references.FieldReference):62:62 -> retraceField
-    1:1:com.android.tools.r8.retrace.RetraceFieldResult retraceField(com.android.tools.r8.references.FieldReference):22 -> retraceField
-    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceFrame(com.android.tools.r8.references.MethodReference,int):55:57 -> retraceFrame
-    1:3:com.android.tools.r8.retrace.RetraceFrameResult retraceFrame(com.android.tools.r8.references.MethodReference,int):22 -> retraceFrame
-    1:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceMethod(com.android.tools.r8.references.MethodReference):49:50 -> retraceMethod
-    1:2:com.android.tools.r8.retrace.RetraceMethodResult retraceMethod(com.android.tools.r8.references.MethodReference):22 -> retraceMethod
-    1:1:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceType(com.android.tools.r8.references.TypeReference):73:73 -> retraceType
-    1:1:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):22 -> retraceType
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.EC:
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.naming.ClassNameMapper):23:25 -> <init>
+    1:8:com.android.tools.r8.retrace.internal.RetracerImpl create(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler,boolean):32:39 -> a
+    9:16:com.android.tools.r8.retrace.internal.RetracerImpl create(com.android.tools.r8.retrace.ProguardMapProducer,com.android.tools.r8.DiagnosticsHandler,boolean):38:45 -> a
+    17:19:com.android.tools.r8.retrace.internal.RetraceClassResultImpl retraceClass(com.android.tools.r8.references.ClassReference):69:69 -> a
+    1:3:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceClass(com.android.tools.r8.references.ClassReference):69:69 -> retraceClass
+    1:3:com.android.tools.r8.retrace.RetraceClassResult retraceClass(com.android.tools.r8.references.ClassReference):19 -> retraceClass
+    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceField(com.android.tools.r8.references.FieldReference):64:64 -> retraceField
+    1:1:com.android.tools.r8.retrace.RetraceFieldResult retraceField(com.android.tools.r8.references.FieldReference):19 -> retraceField
+    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceFrame(com.android.tools.r8.references.MethodReference,int):57:59 -> retraceFrame
+    1:3:com.android.tools.r8.retrace.RetraceFrameResult retraceFrame(com.android.tools.r8.references.MethodReference,int):19 -> retraceFrame
+    1:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceMethod(com.android.tools.r8.references.MethodReference):51:52 -> retraceMethod
+    1:2:com.android.tools.r8.retrace.RetraceMethodResult retraceMethod(com.android.tools.r8.references.MethodReference):19 -> retraceMethod
+    1:1:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceType(com.android.tools.r8.references.TypeReference):75:75 -> retraceType
+    1:1:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):19 -> retraceType
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.fD:
     com.android.tools.r8.retrace.Retracer retracer -> a
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):35:36 -> <init>
     void lambda$retraceFieldOrReturnType$10(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder) -> a
@@ -72257,38 +72569,38 @@
     18:23:com.android.tools.r8.retrace.RetraceStackTraceProxy lambda$retraceClassOrType$0(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassElement,com.android.tools.r8.retrace.RetraceClassResult,java.util.function.Consumer,java.util.function.Consumer):75:80 -> a
     24:26:java.util.stream.Stream lambda$retraceMethod$5(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,java.util.function.Consumer,java.util.function.Consumer):93:95 -> a
     27:31:java.util.stream.Stream lambda$retraceMethod$5(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,java.util.function.Consumer,java.util.function.Consumer):94:98 -> a
-    32:58:java.util.stream.Stream lambda$retraceMethod$4(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFrameElement):100:126 -> a
-    59:63:void lambda$retraceMethod$3(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,java.util.List,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):105:109 -> a
-    64:70:void lambda$retraceMethod$3(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,java.util.List,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):108:114 -> a
-    71:71:void lambda$retraceMethod$3(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,java.util.List,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):113:113 -> a
-    72:80:void lambda$retraceMethod$3(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,java.util.List,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):112:120 -> a
-    81:88:void lambda$retraceMethod$3(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,java.util.List,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):117:124 -> a
-    89:90:java.util.stream.Stream lambda$retraceField$9(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,java.util.function.Consumer):136:137 -> a
-    91:93:java.util.stream.Stream lambda$retraceField$8(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,java.util.function.Consumer,java.util.function.Consumer):140:142 -> a
-    94:96:com.android.tools.r8.retrace.RetraceStackTraceProxy lambda$retraceField$7(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFieldResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFieldElement):145:147 -> a
-    97:106:com.android.tools.r8.retrace.RetraceStackTraceProxy lambda$retraceField$7(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFieldResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFieldElement):146:155 -> a
-    107:114:com.android.tools.r8.retrace.RetraceStackTraceProxy lambda$retraceField$7(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFieldResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFieldElement):152:159 -> a
-    115:126:java.util.stream.Stream retraceFieldOrReturnType(com.android.tools.r8.retrace.StackTraceElementProxy):166:177 -> a
-    127:127:java.util.function.Consumer lambda$retraceFieldOrReturnType$13(com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.RetraceTypeResult$Element):179:179 -> a
-    128:130:void lambda$retraceFieldOrReturnType$12(com.android.tools.r8.retrace.RetraceTypeResult$Element,com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):180:182 -> a
-    131:131:com.android.tools.r8.retrace.RetraceTypeResult lambda$retracedMethodArguments$15(java.lang.String):195:195 -> a
-    132:136:java.util.List lambda$retracedMethodArguments$18(com.android.tools.r8.utils.Box,java.util.List,com.android.tools.r8.retrace.RetraceTypeResult):205:209 -> a
-    137:137:void lambda$retracedMethodArguments$17(java.util.List,java.util.List,com.android.tools.r8.retrace.RetraceTypeResult$Element):211:211 -> a
-    138:140:void lambda$retracedMethodArguments$16(com.android.tools.r8.retrace.RetraceTypeResult$Element,java.util.List,java.util.List):213:215 -> a
-    141:141:java.util.function.Consumer lambda$retracedMethodArguments$20(com.android.tools.r8.utils.Box,java.util.List):223:223 -> a
-    142:144:void lambda$retracedMethodArguments$19(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):224:226 -> a
+    32:59:java.util.stream.Stream lambda$retraceMethod$4(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFrameElement):100:127 -> a
+    60:66:void lambda$retraceMethod$3(java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):104:110 -> a
+    67:73:void lambda$retraceMethod$3(java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):109:115 -> a
+    74:74:void lambda$retraceMethod$3(java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):114:114 -> a
+    75:83:void lambda$retraceMethod$3(java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):113:121 -> a
+    84:91:void lambda$retraceMethod$3(java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetracedMethodReference,java.lang.Integer):118:125 -> a
+    92:93:java.util.stream.Stream lambda$retraceField$9(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,java.util.function.Consumer):137:138 -> a
+    94:96:java.util.stream.Stream lambda$retraceField$8(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,java.util.function.Consumer,java.util.function.Consumer):141:143 -> a
+    97:99:com.android.tools.r8.retrace.RetraceStackTraceProxy lambda$retraceField$7(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFieldResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFieldElement):146:148 -> a
+    100:109:com.android.tools.r8.retrace.RetraceStackTraceProxy lambda$retraceField$7(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFieldResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFieldElement):147:156 -> a
+    110:117:com.android.tools.r8.retrace.RetraceStackTraceProxy lambda$retraceField$7(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceFieldResult,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.retrace.RetraceFieldElement):153:160 -> a
+    118:129:java.util.stream.Stream retraceFieldOrReturnType(com.android.tools.r8.retrace.StackTraceElementProxy):167:178 -> a
+    130:130:java.util.function.Consumer lambda$retraceFieldOrReturnType$13(com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.RetraceTypeResult$Element):180:180 -> a
+    131:133:void lambda$retraceFieldOrReturnType$12(com.android.tools.r8.retrace.RetraceTypeResult$Element,com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):181:183 -> a
+    134:134:com.android.tools.r8.retrace.RetraceTypeResult lambda$retracedMethodArguments$15(java.lang.String):196:196 -> a
+    135:139:java.util.List lambda$retracedMethodArguments$18(com.android.tools.r8.utils.Box,java.util.List,com.android.tools.r8.retrace.RetraceTypeResult):206:210 -> a
+    140:140:void lambda$retracedMethodArguments$17(java.util.List,java.util.List,com.android.tools.r8.retrace.RetraceTypeResult$Element):212:212 -> a
+    141:143:void lambda$retracedMethodArguments$16(com.android.tools.r8.retrace.RetraceTypeResult$Element,java.util.List,java.util.List):214:216 -> a
+    144:144:java.util.function.Consumer lambda$retracedMethodArguments$20(com.android.tools.r8.utils.Box,java.util.List):224:224 -> a
+    145:147:void lambda$retracedMethodArguments$19(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):225:227 -> a
     1:2:java.util.stream.Stream lambda$retraceMethod$6(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,java.util.function.Consumer):89:90 -> b
-    3:4:java.util.stream.Stream retraceField(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):133:134 -> b
-    5:5:void lambda$retraceFieldOrReturnType$11(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):172:172 -> b
-    6:16:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):190:200 -> b
+    3:4:java.util.stream.Stream retraceField(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):134:135 -> b
+    5:5:void lambda$retraceFieldOrReturnType$11(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):173:173 -> b
+    6:16:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):191:201 -> b
     17:18:java.lang.Object com.android.tools.r8.utils.ListUtils.fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):162:163 -> b
-    17:18:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):201 -> b
-    19:39:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):201:221 -> b
+    17:18:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):202 -> b
+    19:39:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):202:222 -> b
     void lambda$retracedMethodArguments$14(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder) -> c
     1:2:java.util.stream.Stream retraceMethod(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):86:87 -> c
     1:12:java.util.stream.Stream retrace(com.android.tools.r8.retrace.StackTraceElementProxy):41:52 -> retrace
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.BC:
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl -> com.android.tools.r8.internal.DC:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.cD:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl -> com.android.tools.r8.internal.eD:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference retracedMethod -> c
     java.util.List methodArguments -> f
@@ -72300,47 +72612,47 @@
     com.android.tools.r8.retrace.RetracedTypeReference fieldOrReturnType -> e
     com.android.tools.r8.retrace.RetracedFieldReference retracedField -> d
     com.android.tools.r8.retrace.StackTraceElementProxy originalItem -> a
-    1:1:void <clinit>():231:231 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.RetracedMethodReference,com.android.tools.r8.retrace.RetracedFieldReference,com.android.tools.r8.retrace.RetracedTypeReference,java.util.List,java.lang.String,int,boolean,boolean,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1):231:231 -> <init>
-    2:13:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.RetracedMethodReference,com.android.tools.r8.retrace.RetracedFieldReference,com.android.tools.r8.retrace.RetracedTypeReference,java.util.List,java.lang.String,int,boolean,boolean):255:266 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.builder(com.android.tools.r8.retrace.StackTraceElementProxy):351:351 -> a
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$000(com.android.tools.r8.retrace.StackTraceElementProxy):231 -> a
-    1:1:int compareTo(java.lang.Object):231:231 -> compareTo
-    2:6:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):361:365 -> compareTo
-    2:6:int compareTo(java.lang.Object):231 -> compareTo
-    7:7:com.android.tools.r8.retrace.RetracedClassReference com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.getRetracedClass():321:321 -> compareTo
-    7:7:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):367 -> compareTo
-    7:7:int compareTo(java.lang.Object):231 -> compareTo
-    8:17:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):367:376 -> compareTo
-    8:17:int compareTo(java.lang.Object):231 -> compareTo
-    18:18:com.android.tools.r8.retrace.RetracedMethodReference com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.getRetracedMethod():326:326 -> compareTo
-    18:18:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):377 -> compareTo
-    18:18:int compareTo(java.lang.Object):231 -> compareTo
-    19:28:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):377:386 -> compareTo
-    19:28:int compareTo(java.lang.Object):231 -> compareTo
-    29:29:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.getSourceFile():346:346 -> compareTo
-    29:29:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):387 -> compareTo
-    29:29:int compareTo(java.lang.Object):231 -> compareTo
-    30:40:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):387:397 -> compareTo
-    30:40:int compareTo(java.lang.Object):231 -> compareTo
-    1:1:int getLineNumber():356:356 -> getLineNumber
-    1:1:java.util.List getMethodArguments():341:341 -> getMethodArguments
-    1:1:com.android.tools.r8.retrace.StackTraceElementProxy getOriginalItem():316:316 -> getOriginalItem
-    1:1:com.android.tools.r8.retrace.RetracedClassReference getRetracedClass():321:321 -> getRetracedClass
-    1:1:com.android.tools.r8.retrace.RetracedFieldReference getRetracedField():331:331 -> getRetracedField
-    1:1:com.android.tools.r8.retrace.RetracedTypeReference getRetracedFieldOrReturnType():336:336 -> getRetracedFieldOrReturnType
-    1:1:com.android.tools.r8.retrace.RetracedMethodReference getRetracedMethod():326:326 -> getRetracedMethod
-    1:1:java.lang.String getSourceFile():346:346 -> getSourceFile
-    1:1:boolean hasFieldOrReturnType():306:306 -> hasFieldOrReturnType
-    1:1:boolean hasLineNumber():301:301 -> hasLineNumber
-    1:1:boolean hasMethodArguments():311:311 -> hasMethodArguments
-    1:1:boolean hasRetracedClass():281:281 -> hasRetracedClass
-    1:1:boolean hasRetracedField():291:291 -> hasRetracedField
-    1:1:boolean hasRetracedMethod():286:286 -> hasRetracedMethod
-    1:1:boolean hasSourceFile():296:296 -> hasSourceFile
-    1:1:boolean isAmbiguous():271:271 -> isAmbiguous
-    1:1:boolean isTopFrame():276:276 -> isTopFrame
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder -> com.android.tools.r8.internal.CC:
+    1:1:void <clinit>():232:232 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.RetracedMethodReference,com.android.tools.r8.retrace.RetracedFieldReference,com.android.tools.r8.retrace.RetracedTypeReference,java.util.List,java.lang.String,int,boolean,boolean,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1):232:232 -> <init>
+    2:13:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.RetracedMethodReference,com.android.tools.r8.retrace.RetracedFieldReference,com.android.tools.r8.retrace.RetracedTypeReference,java.util.List,java.lang.String,int,boolean,boolean):256:267 -> <init>
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.builder(com.android.tools.r8.retrace.StackTraceElementProxy):352:352 -> a
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$000(com.android.tools.r8.retrace.StackTraceElementProxy):232 -> a
+    1:1:int compareTo(java.lang.Object):232:232 -> compareTo
+    2:6:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):362:366 -> compareTo
+    2:6:int compareTo(java.lang.Object):232 -> compareTo
+    7:7:com.android.tools.r8.retrace.RetracedClassReference com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.getRetracedClass():322:322 -> compareTo
+    7:7:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):368 -> compareTo
+    7:7:int compareTo(java.lang.Object):232 -> compareTo
+    8:17:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):368:377 -> compareTo
+    8:17:int compareTo(java.lang.Object):232 -> compareTo
+    18:18:com.android.tools.r8.retrace.RetracedMethodReference com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.getRetracedMethod():327:327 -> compareTo
+    18:18:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):378 -> compareTo
+    18:18:int compareTo(java.lang.Object):232 -> compareTo
+    19:28:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):378:387 -> compareTo
+    19:28:int compareTo(java.lang.Object):232 -> compareTo
+    29:29:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.getSourceFile():347:347 -> compareTo
+    29:29:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):388 -> compareTo
+    29:29:int compareTo(java.lang.Object):232 -> compareTo
+    30:40:int com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl.compareTo(com.android.tools.r8.retrace.RetraceStackTraceProxy):388:398 -> compareTo
+    30:40:int compareTo(java.lang.Object):232 -> compareTo
+    1:1:int getLineNumber():357:357 -> getLineNumber
+    1:1:java.util.List getMethodArguments():342:342 -> getMethodArguments
+    1:1:com.android.tools.r8.retrace.StackTraceElementProxy getOriginalItem():317:317 -> getOriginalItem
+    1:1:com.android.tools.r8.retrace.RetracedClassReference getRetracedClass():322:322 -> getRetracedClass
+    1:1:com.android.tools.r8.retrace.RetracedFieldReference getRetracedField():332:332 -> getRetracedField
+    1:1:com.android.tools.r8.retrace.RetracedTypeReference getRetracedFieldOrReturnType():337:337 -> getRetracedFieldOrReturnType
+    1:1:com.android.tools.r8.retrace.RetracedMethodReference getRetracedMethod():327:327 -> getRetracedMethod
+    1:1:java.lang.String getSourceFile():347:347 -> getSourceFile
+    1:1:boolean hasFieldOrReturnType():307:307 -> hasFieldOrReturnType
+    1:1:boolean hasLineNumber():302:302 -> hasLineNumber
+    1:1:boolean hasMethodArguments():312:312 -> hasMethodArguments
+    1:1:boolean hasRetracedClass():282:282 -> hasRetracedClass
+    1:1:boolean hasRetracedField():292:292 -> hasRetracedField
+    1:1:boolean hasRetracedMethod():287:287 -> hasRetracedMethod
+    1:1:boolean hasSourceFile():297:297 -> hasSourceFile
+    1:1:boolean isAmbiguous():272:272 -> isAmbiguous
+    1:1:boolean isTopFrame():277:277 -> isTopFrame
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder -> com.android.tools.r8.internal.dD:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference methodContext -> c
     java.util.List methodArguments -> f
@@ -72351,30 +72663,30 @@
     com.android.tools.r8.retrace.RetracedTypeReference fieldOrReturnType -> e
     com.android.tools.r8.retrace.RetracedFieldReference retracedField -> d
     com.android.tools.r8.retrace.StackTraceElementProxy originalElement -> a
-    1:1:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1):402:402 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy):415:415 -> <init>
-    3:8:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy):411:416 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedClass(com.android.tools.r8.retrace.RetracedClassReference):420:420 -> a
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$700(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedClassReference):402 -> a
-    2:2:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedMethod(com.android.tools.r8.retrace.RetracedMethodReference):425:425 -> a
-    2:2:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$1100(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedMethodReference):402 -> a
-    3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedField(com.android.tools.r8.retrace.RetracedFieldReference):430:430 -> a
-    3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$800(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedFieldReference):402 -> a
-    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedFieldOrReturnType(com.android.tools.r8.retrace.RetracedTypeReference):435:435 -> a
-    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$600(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedTypeReference):402 -> a
-    5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedMethodArguments(java.util.List):440:440 -> a
-    5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$400(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,java.util.List):402 -> a
-    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setSourceFile(java.lang.String):445:445 -> a
-    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$1000(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,java.lang.String):402 -> a
-    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setLineNumber(int):450:450 -> a
-    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$1200(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,int):402 -> a
-    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setAmbiguous(boolean):455:455 -> a
-    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$500(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,boolean):402 -> a
-    9:13:com.android.tools.r8.retrace.RetraceStackTraceProxy com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.build():465:469 -> a
-    9:13:com.android.tools.r8.retrace.RetraceStackTraceProxy access$100(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):402 -> a
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setTopFrame(boolean):460:460 -> b
-    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$900(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,boolean):402 -> b
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.KC:
+    1:1:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1):403:403 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy):416:416 -> <init>
+    3:8:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy):412:417 -> <init>
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedClass(com.android.tools.r8.retrace.RetracedClassReference):421:421 -> a
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$700(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedClassReference):403 -> a
+    2:2:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedMethod(com.android.tools.r8.retrace.RetracedMethodReference):426:426 -> a
+    2:2:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$1100(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedMethodReference):403 -> a
+    3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedField(com.android.tools.r8.retrace.RetracedFieldReference):431:431 -> a
+    3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$800(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedFieldReference):403 -> a
+    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedFieldOrReturnType(com.android.tools.r8.retrace.RetracedTypeReference):436:436 -> a
+    4:4:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$600(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,com.android.tools.r8.retrace.RetracedTypeReference):403 -> a
+    5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setRetracedMethodArguments(java.util.List):441:441 -> a
+    5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$400(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,java.util.List):403 -> a
+    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setSourceFile(java.lang.String):446:446 -> a
+    6:6:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$1000(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,java.lang.String):403 -> a
+    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setLineNumber(int):451:451 -> a
+    7:7:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$1200(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,int):403 -> a
+    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setAmbiguous(boolean):456:456 -> a
+    8:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$500(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,boolean):403 -> a
+    9:13:com.android.tools.r8.retrace.RetraceStackTraceProxy com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.build():466:470 -> a
+    9:13:com.android.tools.r8.retrace.RetraceStackTraceProxy access$100(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):403 -> a
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setTopFrame(boolean):461:461 -> b
+    1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$900(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,boolean):403 -> b
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.lD:
     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
@@ -72421,20 +72733,20 @@
     1:1:boolean hasMethodName():68:68 -> hasMethodName
     1:9:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceProxy,boolean):141:149 -> toRetracedItem
     1:9:java.lang.Object toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceProxy,boolean):23 -> toRetracedItem
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.FC:
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.hD:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> b
     1:2:void <clinit>():162:163 -> <clinit>
     1:1:void <init>(java.lang.String,int):161:161 -> <init>
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.HC:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.iD:
     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>():349:349 -> <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):347:347 -> <init>
     2:3:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):361:362 -> <init>
     1:4:com.android.tools.r8.references.ClassReference getReference(java.lang.String):366:369 -> a
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.jD:
     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
@@ -72476,7 +72788,7 @@
     43:43:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):211 -> e
     1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):219:225 -> f
     8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):224:224 -> f
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.JC:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.kD:
     com.android.tools.r8.utils.TriFunction retracedString -> c
     int endIndex -> b
     int startIndex -> a
@@ -72484,7 +72796,7 @@
     2:5:void <init>(int,int,com.android.tools.r8.utils.TriFunction):336:339 -> <init>
     1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):319:319 -> a
     2:2:boolean hasIndex():343:343 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.ZC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.AD:
     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
@@ -72526,72 +72838,72 @@
     1:1:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16:16 -> parse
     2:15:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser.parse(java.lang.String):60:73 -> parse
     2:15:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16 -> parse
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1 -> com.android.tools.r8.internal.LC:
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.MC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1 -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.nD:
     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.OC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.pD:
     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.NC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.oD:
     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.PC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.qD:
     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.QC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.rD:
     1:1:void <init>():339:339 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):339:339 -> <init>
     1:1:java.lang.String subExpression():343:343 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):348:348 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):349:353 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.RC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.sD:
     1:1:void <init>():298:298 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):298:298 -> <init>
     1:1:java.lang.String subExpression():302:302 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):307:307 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):308:312 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.SC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.tD:
     1:1:void <init>():359:359 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):359:359 -> <init>
     1:1:java.lang.String subExpression():363:363 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):368:368 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):369:373 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.TC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.uD:
     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.UC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.vD:
     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.VC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.wD:
     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.WC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.xD:
     1:1:void <init>():275:275 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):275:275 -> <init>
     1:2:java.lang.String subExpression():281:282 -> a
     3:3:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):287:287 -> a
     4:8:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):288:292 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.XC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.yD:
     1:1:void <init>():318:318 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):318:318 -> <init>
     1:1:java.lang.String subExpression():322:322 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):327:327 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.YC:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.zD:
     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
@@ -72929,7 +73241,7 @@
     217:217:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1145 -> a
     218:219:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1151:1152 -> a
     220:251:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1174:1205 -> a
-    252:252:boolean com.android.tools.r8.graph.DexClass.isFinal():601:601 -> a
+    252:252:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> a
     252:252:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1205 -> a
     253:254:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1206:1207 -> a
     255:263:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1271:1279 -> a
@@ -72964,7 +73276,7 @@
     17:21:boolean mayPropagateArgumentsTo(com.android.tools.r8.graph.ProgramMethod):890:894 -> b
     22:22:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):947:947 -> b
     23:23:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):951:951 -> b
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> b
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> b
     24:24:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):951 -> b
     25:26:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):951:952 -> b
     27:27:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1038:1038 -> b
@@ -72976,9 +73288,9 @@
     35:44:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1392:1401 -> b
     1:6:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):382:387 -> c
     7:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):517:522 -> c
-    13:13:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):834:834 -> c
+    13:13:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):829:829 -> c
     13:13:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):522 -> c
-    14:14:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):838:838 -> c
+    14:14:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):833:833 -> c
     14:14:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):523 -> c
     15:15:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):524:524 -> c
     16:21:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.isRetargetType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):94:99 -> c
@@ -72990,10 +73302,10 @@
     24:24:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):526 -> c
     25:25:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):518:518 -> c
     26:30:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):791:795 -> c
-    31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):214:214 -> c
+    31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):223:223 -> c
     31:31:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):795 -> c
     32:32:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):796:796 -> c
-    33:33:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> c
+    33:33:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> c
     33:33:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):798 -> c
     34:34:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):798:798 -> c
     35:36:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):832:833 -> c
@@ -73149,7 +73461,7 @@
     3:3:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.V7:
     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>
@@ -73198,7 +73510,7 @@
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):137:137 -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):116:116 -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):121:121 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.D9:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.E9:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -73218,7 +73530,7 @@
     java.util.concurrent.ConcurrentHashMap stringCache -> a
     1:2:void <init>():9:10 -> <init>
     1:1:java.lang.String lookupString(com.android.tools.r8.graph.DexString):13:13 -> a
-com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.Ha:
     java.util.Set checkDiscarded -> a
     java.lang.Iterable classes -> b
     1:3:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.lang.Iterable):20:22 -> <init>
@@ -73292,8 +73604,8 @@
     java.util.Set bootstrapMethods -> M
     1:1:void <clinit>():171:171 -> <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):402:402 -> <init>
-    2:3391: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):217:3606 -> <init>
-    3392:3439: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):403:450 -> <init>
+    2:3392: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):217:3607 -> <init>
+    3393:3440: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):403:450 -> <init>
     com.android.tools.r8.shaking.KeepReason lambda$keepClassAndAllMembers$36(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness) -> a
     1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1000(com.android.tools.r8.shaking.Enqueuer):171:171 -> a
     2:2:void access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):171:171 -> a
@@ -73318,7 +73630,7 @@
     15:17:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1154:1156 -> a
     18:18:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
     18:18:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1158 -> a
-    19:19:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
+    19:19:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
     19:19:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1159 -> a
     20:24:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1160:1164 -> a
     25:25:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):426:426 -> a
@@ -73347,692 +73659,688 @@
     50:50:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):586:586 -> a
     51:51:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):598:598 -> a
     52:52:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):605:605 -> a
-    52:52:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):598 -> a
+    52:52:com.android.tools.r8.graph.DexClass access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):171 -> a
     53:53:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):605:605 -> a
-    53:53:com.android.tools.r8.graph.DexClass access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):171 -> a
-    54:54:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):605:605 -> a
-    55:55:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):621:621 -> a
-    56:62:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2219:2219 -> a
-    56:62:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):621 -> a
-    68:84:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2225:2241 -> a
-    68:84:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):621 -> a
-    85:85:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):645:645 -> a
-    86:86:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    86:86:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):645 -> a
-    87:89:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):647:649 -> a
-    90:94:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):710:714 -> a
-    90:94:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):649 -> a
-    95:95:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):651:651 -> a
-    96:96:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
-    96:96:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):651 -> a
-    97:97:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):658:658 -> a
-    98:98:void com.android.tools.r8.graph.DexClass.forEachClassMethod(java.util.function.Consumer):154:154 -> a
-    98:98:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):658 -> a
-    99:100:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):667:668 -> a
-    101:102:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):654:655 -> a
-    103:103:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):653:653 -> a
-    104:104:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):660:660 -> a
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getReturnType():60:60 -> a
-    105:105:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):662 -> a
-    106:106:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):661:661 -> a
-    107:107:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexClassAndMethod.getParameters():52:52 -> a
+    54:54:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):621:621 -> a
+    55:61:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2219:2219 -> a
+    55:61:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):621 -> a
+    67:83:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2225:2241 -> a
+    67:83:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):621 -> a
+    84:84:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):645:645 -> a
+    85:85:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    85:85:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):645 -> a
+    86:88:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):647:649 -> a
+    89:93:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):710:714 -> a
+    89:93:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):649 -> a
+    94:94:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):651:651 -> a
+    95:95:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
+    95:95:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):651 -> a
+    96:96:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):658:658 -> a
+    97:97:void com.android.tools.r8.graph.DexClass.forEachClassMethod(java.util.function.Consumer):154:154 -> a
+    97:97:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):658 -> a
+    98:99:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):667:668 -> a
+    100:101:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):654:655 -> a
+    102:102:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):653:653 -> a
+    103:103:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):660:660 -> a
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getReturnType():64:64 -> a
+    104:104:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):662 -> a
+    105:105:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):661:661 -> a
+    106:106:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexClassAndMethod.getParameters():56:56 -> a
+    106:106:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):663 -> a
+    107:107:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():67:67 -> a
+    107:107:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexClassAndMethod.getParameters():56 -> a
     107:107:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):663 -> a
-    108:108:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():67:67 -> a
-    108:108:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexClassAndMethod.getParameters():52 -> a
-    108:108:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):663 -> a
-    109:110:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):663:664 -> a
-    111:121:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):678:688 -> a
-    122:122:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):746:746 -> a
-    123:123:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1690:1690 -> a
-    123:123:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):746 -> a
-    124:124:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):747:747 -> a
-    125:125:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1713:1713 -> a
-    125:125:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):747 -> a
-    126:126:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):748:748 -> a
-    127:127:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachClass(java.util.function.BiConsumer):1680:1680 -> a
-    127:127:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):748 -> a
-    128:128:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):753:753 -> a
-    129:130:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):765:766 -> a
-    129:130:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):760 -> a
-    129:130:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):755 -> a
-    131:131:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):771:771 -> a
-    132:132:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    132:132:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):772 -> a
-    133:143:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):773:783 -> a
-    144:148:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):781:785 -> a
-    149:149:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):762:762 -> a
+    108:109:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):663:664 -> a
+    110:120:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):678:688 -> a
+    121:121:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):746:746 -> a
+    122:122:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1690:1690 -> a
+    122:122:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):746 -> a
+    123:123:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):747:747 -> a
+    124:124:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1713:1713 -> a
+    124:124:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):747 -> a
+    125:125:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):748:748 -> a
+    126:126:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachClass(java.util.function.BiConsumer):1680:1680 -> a
+    126:126:void enqueueRootItems(com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):748 -> a
+    127:127:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):753:753 -> a
+    128:129:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):765:766 -> a
+    128:129:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):760 -> a
+    128:129:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):755 -> a
+    130:130:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):771:771 -> a
+    131:131:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    131:131:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):772 -> a
+    132:142:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):773:783 -> a
+    143:147:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):781:785 -> a
+    148:148:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):766:766 -> a
+    148:148:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):785 -> a
+    149:149:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):372:372 -> a
+    149:149:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):766 -> a
     149:149:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):785 -> a
-    150:150:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):372:372 -> a
-    150:150:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):762 -> a
-    150:150:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):785 -> a
-    151:151:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):786:786 -> a
-    152:152:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):795:795 -> a
-    153:153:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):239:239 -> a
+    150:150:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):786:786 -> a
+    151:151:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):795:795 -> a
+    152:152:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):239:239 -> a
+    152:152:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):797 -> a
+    153:153:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):248:248 -> a
+    153:153:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):239 -> a
     153:153:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):797 -> a
-    154:154:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):248:248 -> a
-    154:154:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):239 -> a
-    154:154:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):797 -> a
-    155:157:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):810:812 -> a
-    155:157:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
-    155:157:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):799 -> a
-    158:158:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):811:811 -> a
-    158:158:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
-    158:158:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):799 -> a
-    159:161:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):810:812 -> a
-    159:161:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
-    159:161:void lambda$traceApplication$62(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):2992 -> a
-    162:162:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):811:811 -> a
-    162:162:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
-    162:162:void lambda$traceApplication$62(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):2992 -> a
-    163:167:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):818:822 -> a
-    168:168:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set):828:828 -> a
-    168:168:void lambda$traceApplication$61(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramMethod):2991 -> a
-    169:171:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):833:835 -> a
-    172:172:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):834:834 -> a
-    173:176:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):844:847 -> a
-    173:176:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
-    177:179:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):810:812 -> a
-    177:179:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):847 -> a
-    177:179:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
-    180:180:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):811:811 -> a
-    180:180:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):847 -> a
-    180:180:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
-    181:184:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):848:851 -> a
-    181:184:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
-    185:189:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):874:878 -> a
-    190:193:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):888:891 -> a
-    194:194:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):897:897 -> a
-    194:194:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1382 -> a
-    195:221:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1386:1412 -> a
-    222:222:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    222:222:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1412 -> a
-    223:225:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1415:1417 -> a
-    226:228:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1671:1673 -> a
-    226:228:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1417 -> a
-    229:229:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1420:1420 -> a
-    230:230:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    230:230:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1421 -> a
-    231:231:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1420:1420 -> a
-    232:233:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):913:914 -> a
-    234:265:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):920:951 -> a
-    266:268:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):957:959 -> a
-    269:269:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):699:699 -> a
-    269:269:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):959 -> a
-    270:279:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):961:970 -> a
-    280:280:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2313:2313 -> a
-    280:280:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):972 -> a
-    281:299:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2320:2338 -> a
-    281:299:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2314 -> a
-    281:299:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):972 -> a
-    300:300:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2315:2315 -> a
-    300:300:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):972 -> a
-    301:301:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2345:2345 -> a
+    154:156:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):810:812 -> a
+    154:156:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
+    154:156:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):799 -> a
+    157:157:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):811:811 -> a
+    157:157:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
+    157:157:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):799 -> a
+    158:160:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):810:812 -> a
+    158:160:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
+    158:160:void lambda$traceApplication$62(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):2993 -> a
+    161:161:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):811:811 -> a
+    161:161:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set):805 -> a
+    161:161:void lambda$traceApplication$62(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramField):2993 -> a
+    162:166:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):818:822 -> a
+    167:167:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set):828:828 -> a
+    167:167:void lambda$traceApplication$61(com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.graph.ProgramMethod):2992 -> a
+    168:170:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):833:835 -> a
+    171:171:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):834:834 -> a
+    172:175:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):844:847 -> a
+    172:175:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
+    176:178:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):810:812 -> a
+    176:178:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):847 -> a
+    176:178:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
+    179:179:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):811:811 -> a
+    179:179:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):847 -> a
+    179:179:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
+    180:183:void internalEnqueueRootItem(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):848:851 -> a
+    180:183:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.ProgramMember,java.util.Set):1882 -> a
+    184:188:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):874:878 -> a
+    189:192:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):888:891 -> a
+    193:193:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):897:897 -> a
+    193:193:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1382 -> a
+    194:220:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1386:1412 -> a
+    221:221:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    221:221:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1412 -> a
+    222:224:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1415:1417 -> a
+    225:227:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1671:1673 -> a
+    225:227:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1417 -> a
+    228:228:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1420:1420 -> a
+    229:229:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
+    229:229:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1421 -> a
+    230:230:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1420:1420 -> a
+    231:232:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):913:914 -> a
+    233:264:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):920:951 -> a
+    265:267:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):957:959 -> a
+    268:268:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):699:699 -> a
+    268:268:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):959 -> a
+    269:278:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):961:970 -> a
+    279:279:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2313:2313 -> a
+    279:279:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):972 -> a
+    280:298:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2320:2338 -> a
+    280:298:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2314 -> a
+    280:298:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):972 -> a
+    299:299:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2315:2315 -> a
+    299:299:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):972 -> a
+    300:300:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2345:2345 -> a
+    300:300:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):973 -> a
+    301:301:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
+    301:301:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2345 -> a
     301:301:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):973 -> a
-    302:302:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
-    302:302:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2345 -> a
+    302:302:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2345:2345 -> a
     302:302:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):973 -> a
-    303:303:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2345:2345 -> a
+    303:303:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2344:2344 -> a
     303:303:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):973 -> a
-    304:304:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2344:2344 -> a
-    304:304:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):973 -> a
-    305:335:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):974:1004 -> a
-    336:336:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    336:336:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1235 -> a
+    304:334:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):974:1004 -> a
+    335:335:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    335:335:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1235 -> a
+    335:335:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):992 -> a
+    336:336:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1235:1235 -> a
     336:336:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):992 -> a
-    337:337:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1235:1235 -> a
-    337:337:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):992 -> a
-    338:338:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    338:338:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1214 -> a
+    337:337:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    337:337:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1214 -> a
+    337:337:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):998 -> a
+    338:338:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1214:1214 -> a
     338:338:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):998 -> a
-    339:339:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1214:1214 -> a
-    339:339:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):998 -> a
-    340:340:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1001:1001 -> a
-    341:341:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1353:1353 -> a
+    339:339:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1001:1001 -> a
+    340:340:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1353:1353 -> a
+    340:340:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1001 -> a
+    341:341:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    341:341:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1354 -> a
     341:341:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1001 -> a
-    342:342:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    342:342:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1354 -> a
+    342:342:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1353:1353 -> a
     342:342:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1001 -> a
-    343:343:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1353:1353 -> a
-    343:343:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1001 -> a
-    344:344:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    344:344:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1311 -> a
+    343:343:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    343:343:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1311 -> a
+    343:343:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):995 -> a
+    344:344:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1311:1311 -> a
     344:344:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):995 -> a
-    345:345:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1311:1311 -> a
-    345:345:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):995 -> a
-    346:346:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    346:346:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256 -> a
+    345:345:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    345:345:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256 -> a
+    345:345:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):989 -> a
+    346:346:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256:1256 -> a
     346:346:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):989 -> a
-    347:347:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256:1256 -> a
-    347:347:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):989 -> a
-    348:348:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$5(com.android.tools.r8.graph.DexCallSite):974:974 -> a
-    349:349:void lambda$traceCheckCast$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1009:1009 -> a
-    350:354:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1027:1031 -> a
-    350:354:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1017 -> a
-    355:355:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1018:1018 -> a
-    356:358:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1047:1049 -> a
-    359:361:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> a
-    359:361:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1049 -> a
-    362:372:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1049:1059 -> a
-    373:373:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1438:1438 -> a
-    373:373:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1060 -> a
-    374:381:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1060:1067 -> a
-    382:382:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1052:1052 -> a
-    383:383:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    383:383:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1052 -> a
-    384:384:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1053:1053 -> a
-    385:385:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    385:385:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1053 -> a
-    386:386:com.android.tools.r8.shaking.KeepReason lambda$traceConstClassOrCheckCast$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1083:1083 -> a
-    387:393:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1137:1143 -> a
-    394:394:void lambda$traceInstanceOf$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1176:1176 -> a
-    395:395:void lambda$traceExceptionGuard$10(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1181:1181 -> a
-    396:396:void lambda$traceInvokeDirect$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1190:1190 -> a
-    397:403:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1202:1208 -> a
-    404:404:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1204:1204 -> a
-    405:405:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$13(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):1206:1206 -> a
-    406:406:boolean lambda$registerDeferredActionForDeadProtoBuilder$12(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1207:1207 -> a
-    407:412:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1219:1224 -> a
-    413:413:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    413:413:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1224 -> a
-    414:415:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1226:1227 -> a
-    416:416:void lambda$traceInvokeDirect$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1227:1227 -> a
-    417:417:void lambda$traceNewInstance$19(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1339:1339 -> a
-    418:418: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):1362:1362 -> a
-    419:419:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    419:419: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):1364 -> a
-    420:423:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1364:1367 -> a
-    424:424:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1365:1365 -> a
-    425:425:void lambda$traceStaticFieldRead$20(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1498:1498 -> a
-    426:426:java.lang.Boolean lambda$traceStaticFieldRead$21(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1527:1527 -> a
-    427:439:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1655:1667 -> a
-    440:440:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1678:1678 -> a
-    441:445:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1692:1696 -> a
-    446:446:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():198:198 -> a
-    446:446:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1696 -> a
-    447:451:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1696:1696 -> a
-    455:495:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1700:1740 -> a
-    496:496:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    496:496:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1740 -> a
-    497:508:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1743:1754 -> a
-    509:517:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):719:727 -> a
-    509:517:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1758 -> a
-    518:535:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):722:739 -> a
-    518:535:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1758 -> a
-    536:536:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):734:734 -> a
-    536:536:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1758 -> a
-    537:556:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1762:1781 -> a
-    557:568:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):857:868 -> a
-    557:568:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1782 -> a
-    569:569:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1785:1785 -> a
-    570:570:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    570:570:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1788 -> a
-    571:575:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1789:1793 -> a
-    576:589:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792:1805 -> a
-    590:590:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1538:1538 -> a
-    590:590:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1805 -> a
-    591:594:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1804:1807 -> a
-    595:595:boolean lambda$markTypeAsLive$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1793:1793 -> a
-    596:596:void lambda$markTypeAsLive$27(com.android.tools.r8.graph.DexAnnotation,java.util.List):1796:1796 -> a
-    597:597:void lambda$markTypeAsLive$26(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):1797:1797 -> a
-    598:598:void lambda$markTypeAsLive$28(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1807:1807 -> a
-    599:602:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1811:1814 -> a
-    603:605:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1813:1815 -> a
-    606:606:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):116:116 -> a
-    606:606:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1815 -> a
-    607:607:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1820:1820 -> a
-    608:610:boolean lambda$ensureMethodsContinueToWidenAccess$30(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1822:1824 -> a
-    611:616:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):439:444 -> a
-    611:616:boolean lambda$ensureMethodsContinueToWidenAccess$30(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1824 -> a
-    617:617:void lambda$ensureMethodsContinueToWidenAccess$31(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1825:1825 -> a
-    618:619:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1887:1888 -> a
-    620:620:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1892:1892 -> a
-    621:621:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1896:1896 -> a
-    621:621:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1892 -> a
-    622:623:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[]):1900:1901 -> a
-    622:623:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1896 -> a
-    622:623:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1892 -> a
-    624:639:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1906:1921 -> a
-    640:640:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):25:25 -> a
-    640:640:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1921 -> a
-    641:645:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1922:1926 -> a
-    646:646:java.util.List lambda$processAnnotation$34(com.android.tools.r8.graph.DexAnnotation):1916:1916 -> a
-    647:650:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1931:1934 -> a
-    651:655:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1933:1937 -> a
-    656:656:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):585:585 -> a
+    347:347:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$5(com.android.tools.r8.graph.DexCallSite):974:974 -> a
+    348:348:void lambda$traceCheckCast$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1009:1009 -> a
+    349:353:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1027:1031 -> a
+    349:353:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1017 -> a
+    354:354:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1018:1018 -> a
+    355:357:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1047:1049 -> a
+    358:360:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> a
+    358:360:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1049 -> a
+    361:371:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1049:1059 -> a
+    372:372:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1453:1453 -> a
+    372:372:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1060 -> a
+    373:380:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1060:1067 -> a
+    381:381:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1052:1052 -> a
+    382:382:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    382:382:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1052 -> a
+    383:383:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1053:1053 -> a
+    384:384:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    384:384:boolean lambda$isConstClassMaybeUsedAsLock$7(com.android.tools.r8.code.CfOrDexInstruction):1053 -> a
+    385:385:com.android.tools.r8.shaking.KeepReason lambda$traceConstClassOrCheckCast$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1083:1083 -> a
+    386:392:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1137:1143 -> a
+    393:393:void lambda$traceInstanceOf$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1176:1176 -> a
+    394:394:void lambda$traceExceptionGuard$10(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1181:1181 -> a
+    395:395:void lambda$traceInvokeDirect$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1190:1190 -> a
+    396:402:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1202:1208 -> a
+    403:403:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1204:1204 -> a
+    404:404:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$13(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):1206:1206 -> a
+    405:405:boolean lambda$registerDeferredActionForDeadProtoBuilder$12(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1207:1207 -> a
+    406:411:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1219:1224 -> a
+    412:412:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    412:412:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1224 -> a
+    413:414:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1226:1227 -> a
+    415:415:void lambda$traceInvokeDirect$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1227:1227 -> a
+    416:416:void lambda$traceNewInstance$19(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1339:1339 -> a
+    417:417: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):1362:1362 -> a
+    418:418:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    418:418: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):1364 -> a
+    419:422: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):1364:1367 -> a
+    423:423:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1365:1365 -> a
+    424:424:void lambda$traceStaticFieldRead$20(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1498:1498 -> a
+    425:425:java.lang.Boolean lambda$traceStaticFieldRead$21(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1527:1527 -> a
+    426:438:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1655:1667 -> a
+    439:439:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1678:1678 -> a
+    440:444:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1692:1696 -> a
+    445:445:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():198:198 -> a
+    445:445:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1696 -> a
+    446:450:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1696:1696 -> a
+    454:494:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1700:1740 -> a
+    495:495:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    495:495:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1740 -> a
+    496:507:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1743:1754 -> a
+    508:516:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):719:727 -> a
+    508:516:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1758 -> a
+    517:534:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):722:739 -> a
+    517:534:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1758 -> a
+    535:535:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):734:734 -> a
+    535:535:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1758 -> a
+    536:555:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1762:1781 -> a
+    556:567:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):857:868 -> a
+    556:567:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1782 -> a
+    568:568:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1785:1785 -> a
+    569:569:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    569:569:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1788 -> a
+    570:574:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1789:1793 -> a
+    575:588:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792:1805 -> a
+    589:589:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1538:1538 -> a
+    589:589:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1805 -> a
+    590:593:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1804:1807 -> a
+    594:594:boolean lambda$markTypeAsLive$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1793:1793 -> a
+    595:595:void lambda$markTypeAsLive$27(com.android.tools.r8.graph.DexAnnotation,java.util.List):1796:1796 -> a
+    596:596:void lambda$markTypeAsLive$26(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):1797:1797 -> a
+    597:597:void lambda$markTypeAsLive$28(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1807:1807 -> a
+    598:601:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1811:1814 -> a
+    602:604:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1813:1815 -> a
+    605:605:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):116:116 -> a
+    605:605:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1815 -> a
+    606:606:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1820:1820 -> a
+    607:609:boolean lambda$ensureMethodsContinueToWidenAccess$30(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1822:1824 -> a
+    610:615:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):439:444 -> a
+    610:615:boolean lambda$ensureMethodsContinueToWidenAccess$30(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1824 -> a
+    616:616:void lambda$ensureMethodsContinueToWidenAccess$31(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1825:1825 -> a
+    617:618:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1887:1888 -> a
+    619:619:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1892:1892 -> a
+    620:620:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1896:1896 -> a
+    620:620:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1892 -> a
+    621:622:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[]):1900:1901 -> a
+    621:622:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet):1896 -> a
+    621:622:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1892 -> a
+    623:638:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1906:1921 -> a
+    639:639:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):25:25 -> a
+    639:639:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1921 -> a
+    640:644:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation):1922:1926 -> a
+    645:645:java.util.List lambda$processAnnotation$34(com.android.tools.r8.graph.DexAnnotation):1916:1916 -> a
+    646:649:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1931:1934 -> a
+    650:654:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1933:1937 -> a
+    655:655:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):585:585 -> a
+    655:655:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1938 -> a
+    656:656:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
+    656:656:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):586 -> a
     656:656:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1938 -> a
-    657:657:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    657:657:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):586 -> a
+    657:657:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):586:586 -> a
     657:657:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1938 -> a
-    658:658:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):586:586 -> a
-    658:658:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):1938 -> a
-    659:690:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2095:2126 -> a
-    691:715:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2131:2155 -> a
-    716:716:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
-    716:716:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2155 -> a
-    717:728:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2160:2171 -> a
-    729:731:void lambda$ensureFromLibraryOrThrow$35(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2149:2151 -> a
-    732:734:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2183:2185 -> a
-    735:735:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():625:625 -> a
-    735:735:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2186 -> a
-    736:743:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2186:2193 -> a
-    744:746:void lambda$keepClassAndAllMembers$37(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2189:2191 -> a
-    747:749:void lambda$keepClassAndAllMembers$38(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2195:2197 -> a
+    658:689:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2095:2126 -> a
+    690:714:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2131:2155 -> a
+    715:715:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
+    715:715:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2155 -> a
+    716:727:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2160:2171 -> a
+    728:730:void lambda$ensureFromLibraryOrThrow$35(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2149:2151 -> a
+    731:733:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2183:2185 -> a
+    734:734:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():629:629 -> a
+    734:734:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2186 -> a
+    735:742:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2186:2193 -> a
+    743:745:void lambda$keepClassAndAllMembers$37(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2189:2191 -> a
+    746:748:void lambda$keepClassAndAllMembers$38(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2195:2197 -> a
+    749:749:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2202:2202 -> a
+    749:749:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2206 -> a
+    749:749:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):171 -> a
     750:750:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2202:2202 -> a
     750:750:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2206 -> a
-    750:750:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):171 -> a
     751:751:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2202:2202 -> a
-    751:751:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2206 -> a
-    752:752:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2202:2202 -> a
-    752:752:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2210 -> a
-    752:752:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2215 -> a
-    753:753: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):2255:2255 -> a
-    754:754:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    754:754: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):2255 -> a
-    755:761: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):2255:2261 -> a
-    762:763: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):2290:2291 -> a
-    762:763:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2264 -> a
-    764:765: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):2268:2269 -> a
-    766:766:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    766:766: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):2269 -> a
-    767:769: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):2272:2274 -> a
-    770:770:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    770:770:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2349 -> a
-    770:770: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):2277 -> a
-    771:774:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2349:2352 -> a
-    771:774: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):2277 -> a
-    775:775:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-    775:775:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2352 -> a
+    751:751:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2210 -> a
+    751:751:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2215 -> a
+    752:752: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):2255:2255 -> a
+    753:753:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    753:753: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):2255 -> a
+    754:760:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2255:2261 -> a
+    761:762: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):2290:2291 -> a
+    761:762: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):2264 -> a
+    763:764: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):2268:2269 -> a
+    765:765:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    765:765: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):2269 -> a
+    766:768: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):2272:2274 -> a
+    769:769:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    769:769:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2349 -> a
+    769:769: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):2277 -> a
+    770:773:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2349:2352 -> a
+    770:773: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):2277 -> a
+    774:774:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+    774:774:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2352 -> a
+    774:774: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):2277 -> a
+    775:775:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2352:2352 -> a
     775:775: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):2277 -> a
-    776:776:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2352:2352 -> a
+    776:776:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2351:2351 -> a
     776:776: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):2277 -> a
-    777:777:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2351:2351 -> a
-    777:777: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):2277 -> a
-    778:787:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2515:2524 -> a
-    778:787: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):2279 -> a
-    788:788:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2528:2528 -> a
+    777:786:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2515:2524 -> a
+    777:786: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):2279 -> a
+    787:787:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2528:2528 -> a
+    787:787: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):2281 -> a
+    788:788:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    788:788:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2528 -> a
     788:788: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):2281 -> a
-    789:789:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    789:789:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2528 -> a
-    789:789: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):2281 -> a
-    790:792:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2528:2530 -> a
-    790:792: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):2281 -> a
-    793:793:void lambda$processNewlyInstantiatedClass$39(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2262:2262 -> a
-    794:794:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296:2296 -> a
-    795:795:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    795:795:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296 -> a
-    796:797:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296:2297 -> a
-    798:799:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2534:2535 -> a
-    798:799:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2298 -> a
-    800:808:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2364:2372 -> a
-    809:823:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2427:2441 -> a
-    809:823:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
-    824:824:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2438:2438 -> a
+    789:791:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2528:2530 -> a
+    789:791: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):2281 -> a
+    792:792:void lambda$processNewlyInstantiatedClass$39(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2262:2262 -> a
+    793:793:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296:2296 -> a
+    794:794:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    794:794:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296 -> a
+    795:796:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296:2297 -> a
+    797:798:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2534:2535 -> a
+    797:798:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2298 -> a
+    799:807:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2364:2372 -> a
+    808:822:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2427:2441 -> a
+    808:822:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
+    823:823:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2438:2438 -> a
+    823:823:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
+    824:824:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    824:824:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2448 -> a
     824:824:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
-    825:825:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    825:825:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2448 -> a
-    825:825:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
-    826:828:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2448:2450 -> a
-    826:828:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
-    829:833:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2449:2453 -> a
-    829:833:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
-    834:840:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2452:2458 -> a
-    834:840:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
-    841:841:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2455:2455 -> a
-    841:841:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
-    842:845:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2376:2379 -> a
-    846:846:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2390:2390 -> a
-    847:847:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    847:847:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2390 -> a
-    848:850:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2390:2390 -> a
-    851:851:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2385:2385 -> a
-    851:851:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2392 -> a
-    852:853:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2392:2393 -> a
-    854:862:void lambda$markProgramMethodOverridesAsLive$45(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,java.util.Set):2395:2403 -> a
-    863:872:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2405:2414 -> a
-    873:874:void lambda$markProgramMethodOverridesAsLive$40(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):2410:2411 -> a
-    875:875:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    875:875:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):22 -> a
-    875:875:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
-    876:878:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):23:25 -> a
-    876:878:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
-    879:879:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    879:879:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):25 -> a
-    879:879:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
-    880:881:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):25:26 -> a
-    880:881:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
-    882:882:boolean lambda$markProgramMethodOverridesAsLive$41(com.android.tools.r8.graph.DexDefinition):2413:2413 -> a
-    883:883:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):142:142 -> a
-    883:883:boolean lambda$markProgramMethodOverridesAsLive$41(com.android.tools.r8.graph.DexDefinition):2413 -> a
-    884:884:void lambda$markProgramMethodOverridesAsLive$43(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2416:2416 -> a
-    885:887:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$42(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2419:2419 -> a
-    888:888:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2467:2467 -> a
-    889:931:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3693:3735 -> a
-    889:931:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2471 -> a
-    932:937:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2474:2479 -> a
-    938:938:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    938:938:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2479 -> a
-    939:939:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2482:2482 -> a
-    940:940:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2481:2481 -> a
-    941:941:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$46(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2477:2477 -> a
-    942:953:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2488:2499 -> a
-    954:956:void lambda$markOverridesAsLibraryMethodOverrides$47(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2501:2503 -> a
-    957:978:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2572:2593 -> a
-    979:979:void lambda$markFieldAsLive$48(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2593:2593 -> a
-    980:981:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2628:2629 -> a
-    982:982:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    982:982:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2630 -> a
-    983:983:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2630:2630 -> a
-    984:984:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2661:2661 -> a
-    985:985:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2665:2665 -> a
-    986:987:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2675:2676 -> a
-    988:989:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2691:2692 -> a
-    990:990:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    990:990:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2692 -> a
-    991:992:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2693:2694 -> a
-    993:993:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2698:2698 -> a
-    994:994:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2716:2716 -> a
-    994:994:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3527 -> a
-    995:999:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3528:3532 -> a
-    1000:1001:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):92:93 -> a
-    1000:1001:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3532 -> a
-    1002:1005:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3534:3537 -> a
-    1006:1006:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1538:1538 -> a
-    1006:1006:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3538 -> a
-    1007:1007:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3537:3537 -> a
-    1008:1009:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2720:2721 -> a
-    1010:1010:void forAllLiveClasses(java.util.function.Consumer):2725:2725 -> a
-    1011:1027:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2730:2746 -> a
-    1028:1028:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1958:1958 -> a
-    1028:1028:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
-    1029:1030:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):603:604 -> a
-    1029:1030:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1958 -> a
-    1029:1030:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
-    1031:1033:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1959:1961 -> a
-    1031:1033:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
-    1034:1039:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1960:1965 -> a
-    1034:1039:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
-    1040:1044:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1964:1968 -> a
-    1040:1044:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
-    1045:1056:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2755:2766 -> a
-    1057:1057:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2385:2385 -> a
-    1057:1057:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2767 -> a
-    1058:1066:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2767:2775 -> a
-    1067:1067:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1067:1067:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2775 -> a
-    1068:1090:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2780:2802 -> a
-    1091:1091:void lambda$markVirtualMethodAsReachable$52(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2799:2799 -> a
-    1092:1092:void lambda$markVirtualMethodAsReachable$55(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2804:2804 -> a
-    1093:1095:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$54(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2807:2807 -> a
-    1096:1097:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2813:2814 -> a
-    1098:1100:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2823:2825 -> a
-    1098:1100:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2814 -> a
-    1101:1102:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2816:2817 -> a
-    1103:1106:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2831:2834 -> a
-    1103:1106:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2817 -> a
-    1107:1107:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2833:2833 -> a
-    1107:1107:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2817 -> a
-    1108:1109:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2843:2844 -> a
-    1110:1113:void lambda$markFailedMethodResolutionTargets$56(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2846:2849 -> a
-    1114:1114:void lambda$markEnumValuesAsReachable$57(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2872:2872 -> a
-    1115:1115:void lambda$traceMainDex$59(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):2935:2935 -> a
-    1116:1120:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2947:2951 -> a
-    1121:1121:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):479:479 -> a
-    1121:1121:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2951 -> a
-    1122:1124:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2955:2957 -> a
-    1125:1125:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):479:479 -> a
-    1125:1125:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2957 -> a
-    1126:1130:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2959:2963 -> a
-    1131:1131:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> a
-    1131:1131:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2963 -> a
-    1132:1155:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2963:2986 -> a
-    1156:1156:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):218:218 -> a
-    1156:1156:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2986 -> a
-    1157:1158:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):765:766 -> a
-    1157:1158:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):760 -> a
-    1157:1158:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2990 -> a
-    1159:1160:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2991:2992 -> a
-    1161:1178:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2979:2996 -> a
-    1179:1182:void finalizeLibraryMethodOverrideInformation():3201:3204 -> a
-    1179:1182:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2997 -> a
-    1183:1184:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2998:2999 -> a
-    1185:1187:boolean verifyKeptGraph():3211:3213 -> a
-    1185:1187:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2999 -> a
-    1188:1193:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3000:3005 -> a
+    825:827:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2448:2450 -> a
+    825:827:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
+    828:832:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2449:2453 -> a
+    828:832:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
+    833:839:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2452:2458 -> a
+    833:839:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
+    840:840:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2455:2455 -> a
+    840:840:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2374 -> a
+    841:844:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2376:2379 -> a
+    845:845:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2390:2390 -> a
+    846:846:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
+    846:846:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2390 -> a
+    847:849:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2390:2390 -> a
+    850:850:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2385:2385 -> a
+    850:850:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2392 -> a
+    851:852:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2392:2393 -> a
+    853:861:void lambda$markProgramMethodOverridesAsLive$45(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,java.util.Set):2395:2403 -> a
+    862:871:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2405:2414 -> a
+    872:873:void lambda$markProgramMethodOverridesAsLive$40(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):2410:2411 -> a
+    874:874:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    874:874:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):22 -> a
+    874:874:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
+    875:877:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):23:25 -> a
+    875:877:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
+    878:878:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
+    878:878:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):25 -> a
+    878:878:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
+    879:880:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):25:26 -> a
+    879:880:void lambda$markProgramMethodOverridesAsLive$40(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):2411 -> a
+    881:881:boolean lambda$markProgramMethodOverridesAsLive$41(com.android.tools.r8.graph.DexDefinition):2413:2413 -> a
+    882:882:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):142:142 -> a
+    882:882:boolean lambda$markProgramMethodOverridesAsLive$41(com.android.tools.r8.graph.DexDefinition):2413 -> a
+    883:883:void lambda$markProgramMethodOverridesAsLive$43(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2416:2416 -> a
+    884:886:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$42(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2419:2419 -> a
+    887:887:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2467:2467 -> a
+    888:930:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3694:3736 -> a
+    888:930:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2471 -> a
+    931:936:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2474:2479 -> a
+    937:937:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    937:937:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2479 -> a
+    938:938:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2482:2482 -> a
+    939:939:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2481:2481 -> a
+    940:940:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$46(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2477:2477 -> a
+    941:952:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2488:2499 -> a
+    953:955:void lambda$markOverridesAsLibraryMethodOverrides$47(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2501:2503 -> a
+    956:977:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2572:2593 -> a
+    978:978:void lambda$markFieldAsLive$48(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2593:2593 -> a
+    979:980:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2628:2629 -> a
+    981:981:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
+    981:981:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2630 -> a
+    982:982:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2630:2630 -> a
+    983:983:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2661:2661 -> a
+    984:984:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2665:2665 -> a
+    985:986:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2675:2676 -> a
+    987:988:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2691:2692 -> a
+    989:989:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    989:989:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2692 -> a
+    990:991:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2693:2694 -> a
+    992:992:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2698:2698 -> a
+    993:993:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2716:2716 -> a
+    993:993:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3528 -> a
+    994:998:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3529:3533 -> a
+    999:1000:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):92:93 -> a
+    999:1000:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3533 -> a
+    1001:1004:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3535:3538 -> a
+    1005:1005:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1538:1538 -> a
+    1005:1005:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3539 -> a
+    1006:1006:void lambda$addConsequentRootSet$74(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3538:3538 -> a
+    1007:1008:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2720:2721 -> a
+    1009:1009:void forAllLiveClasses(java.util.function.Consumer):2725:2725 -> a
+    1010:1026:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2730:2746 -> a
+    1027:1027:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1958:1958 -> a
+    1027:1027:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
+    1028:1029:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):603:604 -> a
+    1028:1029:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1958 -> a
+    1028:1029:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
+    1030:1032:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1959:1961 -> a
+    1030:1032:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
+    1033:1038:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1960:1965 -> a
+    1033:1038:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
+    1039:1043:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):1964:1968 -> a
+    1039:1043:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750 -> a
+    1044:1055:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2755:2766 -> a
+    1056:1056:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2385:2385 -> a
+    1056:1056:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2767 -> a
+    1057:1065:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2767:2775 -> a
+    1066:1066:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1066:1066:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2775 -> a
+    1067:1089:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2780:2802 -> a
+    1090:1090:void lambda$markVirtualMethodAsReachable$52(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2799:2799 -> a
+    1091:1091:void lambda$markVirtualMethodAsReachable$55(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2804:2804 -> a
+    1092:1094:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$54(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2807:2807 -> a
+    1095:1096:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2813:2814 -> a
+    1097:1099:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2823:2825 -> a
+    1097:1099:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2814 -> a
+    1100:1101:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2816:2817 -> a
+    1102:1105:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2831:2834 -> a
+    1102:1105:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2817 -> a
+    1106:1106:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2833:2833 -> a
+    1106:1106:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2817 -> a
+    1107:1108:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2843:2844 -> a
+    1109:1112:void lambda$markFailedMethodResolutionTargets$56(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2846:2849 -> a
+    1113:1113:void lambda$markEnumValuesAsReachable$57(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2872:2872 -> a
+    1114:1114:void lambda$traceMainDex$59(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):2935:2935 -> a
+    1115:1119:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2947:2951 -> a
+    1120:1120:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):479:479 -> a
+    1120:1120:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2951 -> a
+    1121:1123:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2955:2957 -> a
+    1124:1124:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):479:479 -> a
+    1124:1124:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2957 -> a
+    1125:1129:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2959:2963 -> a
+    1130:1130:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> a
+    1130:1130:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2963 -> a
+    1131:1155:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2963:2987 -> a
+    1156:1157:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):765:766 -> a
+    1156:1157:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set):760 -> a
+    1156:1157:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2991 -> a
+    1158:1159:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2992:2993 -> a
+    1160:1178:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2979:2997 -> a
+    1179:1182:void finalizeLibraryMethodOverrideInformation():3202:3205 -> a
+    1179:1182:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2998 -> a
+    1183:1184:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2999:3000 -> a
+    1185:1187:boolean verifyKeptGraph():3212:3214 -> a
+    1185:1187:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3000 -> a
+    1188:1193:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3001:3006 -> a
     1194:1194:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():210:210 -> a
-    1194:1194:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3005 -> a
-    1195:1195:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3010:3010 -> a
+    1194:1194:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3006 -> a
+    1195:1195:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3011:3011 -> a
     1196:1197:void lambda$traceApplication$60(com.android.tools.r8.graph.DexReference,java.util.List):2973:2974 -> a
-    1198:1198:void lambda$traceApplication$63(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2998:2998 -> a
-    1199:1199:void lambda$keepClassWithRules$64(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3014:3014 -> a
-    1200:1200:void lambda$keepMethodWithRules$65(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3018:3018 -> a
-    1201:1201:void keepFieldWithRules(com.android.tools.r8.graph.ProgramField,java.util.Set):3022:3022 -> a
-    1202:1202:void lambda$keepFieldWithRules$66(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3022:3022 -> a
-    1203:1205:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3029:3031 -> a
+    1198:1198:void lambda$traceApplication$63(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2999:2999 -> a
+    1199:1199:void lambda$keepClassWithRules$64(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3015:3015 -> a
+    1200:1200:void lambda$keepMethodWithRules$65(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3019:3019 -> a
+    1201:1201:void keepFieldWithRules(com.android.tools.r8.graph.ProgramField,java.util.Set):3023:3023 -> a
+    1202:1202:void lambda$keepFieldWithRules$66(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3023:3023 -> a
+    1203:1205:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3030:3032 -> a
     1206:1206:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    1206:1206:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3031 -> a
-    1207:1207:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3031:3031 -> a
+    1206:1206:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3032 -> a
+    1207:1207:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3032:3032 -> a
     1208:1208:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardIfRule.getSubsequentRule():42:42 -> a
-    1208:1208:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3031 -> a
-    1209:1221:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3032:3044 -> a
-    1222:1222:com.android.tools.r8.graph.DexApplication lambda$synthesize$67(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3146:3146 -> a
-    1223:1224:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):3101:3102 -> a
-    1223:1224:com.android.tools.r8.graph.DexApplication lambda$synthesize$67(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3147 -> a
-    1225:1225:com.android.tools.r8.graph.DexApplication lambda$synthesize$67(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3148:3148 -> a
-    1226:1229:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3159:3162 -> a
+    1208:1208:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3032 -> a
+    1209:1221:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):3033:3045 -> a
+    1222:1222:com.android.tools.r8.graph.DexApplication lambda$synthesize$67(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3147:3147 -> a
+    1223:1224:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):3102:3103 -> a
+    1223:1224:com.android.tools.r8.graph.DexApplication lambda$synthesize$67(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3148 -> a
+    1225:1225:com.android.tools.r8.graph.DexApplication lambda$synthesize$67(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3149:3149 -> a
+    1226:1229:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3160:3163 -> a
     1230:1230: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):54:54 -> a
-    1230:1230:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3163 -> a
-    1231:1238:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3167:3174 -> a
-    1239:1239:void lambda$desugar$68(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3170:3170 -> a
-    1240:1242:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3178:3180 -> a
-    1243:1245:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3185:3187 -> a
-    1246:1274:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3221:3249 -> a
+    1230:1230:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3164 -> a
+    1231:1238:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3168:3175 -> a
+    1239:1239:void lambda$desugar$68(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3171:3171 -> a
+    1240:1242:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3179:3181 -> a
+    1243:1245:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3186:3188 -> a
+    1246:1274:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3222:3250 -> a
     1275:1275:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1275:1275:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3249 -> a
-    1276:1277:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3250:3251 -> a
+    1275:1275:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3250 -> a
+    1276:1277:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3251:3252 -> a
     1278:1278:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    1278:1278:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3251 -> a
-    1279:1323:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3252:3296 -> a
-    1324:1329:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3418:3423 -> a
-    1324:1329:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3317 -> a
-    1330:1338:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3318:3326 -> a
-    1339:1339:void lambda$createEnqueuerResult$69(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3224:3224 -> a
-    1340:1340:boolean lambda$createEnqueuerResult$70(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3230:3230 -> a
-    1341:1347:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3330:3336 -> a
-    1348:1359:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3366:3377 -> a
-    1348:1359:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3336 -> a
+    1278:1278:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3252 -> a
+    1279:1323:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3253:3297 -> a
+    1324:1329:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3419:3424 -> a
+    1324:1329:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3318 -> a
+    1330:1338:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3319:3327 -> a
+    1339:1339:void lambda$createEnqueuerResult$69(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3225:3225 -> a
+    1340:1340:boolean lambda$createEnqueuerResult$70(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3231:3231 -> a
+    1341:1347:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3331:3337 -> a
+    1348:1359:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3367:3378 -> a
+    1348:1359:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3337 -> a
     1360:1360:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2702:2702 -> a
-    1360:1360:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3377 -> a
-    1360:1360:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3336 -> a
-    1361:1361:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3378:3378 -> a
-    1361:1361:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3336 -> a
-    1362:1364:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3386:3388 -> a
-    1362:1364:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3378 -> a
-    1362:1364:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3336 -> a
-    1365:1381:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3343:3359 -> a
-    1382:1404:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3429:3451 -> a
+    1360:1360:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3378 -> a
+    1360:1360:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3337 -> a
+    1361:1361:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3379:3379 -> a
+    1361:1361:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3337 -> a
+    1362:1364:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3387:3389 -> a
+    1362:1364:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3379 -> a
+    1362:1364:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3337 -> a
+    1365:1381:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3344:3360 -> a
+    1382:1404:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3430:3452 -> a
     1405:1405: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):2229:2229 -> a
-    1405:1405:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3452 -> a
-    1406:1465:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3453:3512 -> a
-    1466:1466:java.util.Set lambda$trace$72(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3448:3448 -> a
-    1467:1467:void lambda$trace$73(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3480:3480 -> a
-    1468:1468:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3524:3524 -> a
+    1405:1405:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3453 -> a
+    1406:1465:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3454:3513 -> a
+    1466:1466:java.util.Set lambda$trace$72(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3449:3449 -> a
+    1467:1467:void lambda$trace$73(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3481:3481 -> a
+    1468:1468:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3525:3525 -> a
     1469:1470:void com.android.tools.r8.shaking.RootSetUtils$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1438:1439 -> a
     1469:1470:void com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2199 -> a
-    1469:1470:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3524 -> a
+    1469:1470:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3525 -> a
     1471:1471:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     1471:1471:void com.android.tools.r8.shaking.RootSetUtils$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1439 -> a
     1471:1471:void com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2199 -> a
-    1471:1471:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3524 -> a
+    1471:1471:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3525 -> a
     1472:1475:void com.android.tools.r8.shaking.RootSetUtils$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1440:1443 -> a
     1472:1475:void com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2199 -> a
-    1472:1475:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3524 -> a
-    1476:1501:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3541:3566 -> a
+    1472:1475:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3525 -> a
+    1476:1501:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3542:3567 -> a
     1502:1502:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1675:1675 -> a
     1502:1502:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1669 -> a
-    1502:1502:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3566 -> a
+    1502:1502:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3567 -> a
     1503:1503:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.Consumer):1685:1685 -> a
     1503:1503:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1695 -> a
     1503:1503:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1670 -> a
-    1503:1503:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3566 -> a
+    1503:1503:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3567 -> a
     1504:1504:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1708:1708 -> a
     1504:1504:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1696 -> a
     1504:1504:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1670 -> a
-    1504:1504:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3566 -> a
-    1505:1508:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3569:3572 -> a
-    1509:1510:void lambda$addConsequentRootSet$75(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):3544:3545 -> a
-    1511:1512:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3550:3551 -> a
+    1504:1504:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3567 -> a
+    1505:1508:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet,boolean):3570:3573 -> a
+    1509:1510:void lambda$addConsequentRootSet$75(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.shaking.RootSetUtils$ItemsWithRules):3545:3546 -> a
+    1511:1512:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3551:3552 -> a
     1513:1513:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1675:1675 -> a
     1513:1513:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1669 -> a
-    1513:1513:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3551 -> a
+    1513:1513:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3552 -> a
     1514:1514:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachField(java.util.function.Consumer):1685:1685 -> a
     1514:1514:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1695 -> a
     1514:1514:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1670 -> a
-    1514:1514:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3551 -> a
+    1514:1514:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3552 -> a
     1515:1515:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1708:1708 -> a
     1515:1515:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1696 -> a
     1515:1515:void com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1670 -> a
-    1515:1515:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3551 -> a
-    1516:1516:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3583:3583 -> a
+    1515:1515:void lambda$addConsequentRootSet$77(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules):3552 -> a
+    1516:1516:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3584:3584 -> a
     1517:1517:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    1517:1517:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3583 -> a
-    1518:1518:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3585:3585 -> a
+    1517:1517:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3584 -> a
+    1518:1518:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3586:3586 -> a
     1519:1519:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2716:2716 -> a
-    1519:1519:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3586 -> a
-    1520:1524:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3588:3592 -> a
-    1525:1527:void retainAnnotationForFinalTreeShaking(java.util.List):3641:3643 -> a
-    1528:1528:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3685:3685 -> a
+    1519:1519:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3587 -> a
+    1520:1524:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3589:3593 -> a
+    1525:1527:void retainAnnotationForFinalTreeShaking(java.util.List):3642:3644 -> a
+    1528:1528:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3686:3686 -> a
     1529:1529:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    1529:1529:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3685 -> a
-    1530:1532:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3686:3688 -> a
-    1533:1541:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):3744:3752 -> a
-    1542:1548:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3760:3766 -> a
+    1529:1529:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3686 -> a
+    1530:1532:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3687:3689 -> a
+    1533:1541:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):3745:3753 -> a
+    1542:1548:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3761:3767 -> a
     1549:1549:com.android.tools.r8.shaking.Enqueuer$Mode getMode():459:459 -> a
-    1549:1549:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):3820 -> a
-    1549:1549:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3769 -> a
-    1550:1551:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):3820:3821 -> a
-    1550:1551:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3769 -> a
-    1552:1552:void traceCode(com.android.tools.r8.graph.ProgramMethod):3829:3829 -> a
-    1552:1552:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):3825 -> a
-    1552:1552:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3769 -> a
-    1553:1557:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3771:3775 -> a
+    1549:1549:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):3821 -> a
+    1549:1549:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3770 -> a
+    1550:1551:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):3821:3822 -> a
+    1550:1551:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3770 -> a
+    1552:1552:void traceCode(com.android.tools.r8.graph.ProgramMethod):3830:3830 -> a
+    1552:1552:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):3826 -> a
+    1552:1552:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3770 -> a
+    1553:1557:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3772:3776 -> a
     1558:1558:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1558:1558:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3775 -> a
+    1558:1558:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3776 -> a
     1559:1559:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> a
-    1559:1559:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3777 -> a
-    1560:1560:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3777:3777 -> a
+    1559:1559:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3778 -> a
+    1560:1560:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3778:3778 -> a
     1561:1561:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> a
-    1561:1561:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3778 -> a
-    1562:1572:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3778:3788 -> a
-    1573:1573:void lambda$markMethodAsLive$80(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3788:3788 -> a
-    1574:1574:void lambda$traceMethodDefinitionExcludingCode$81(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):3816:3816 -> a
-    1575:1585:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3833:3843 -> a
-    1586:1588:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3842:3844 -> a
-    1589:1589:boolean lambda$checkMemberForSoftPinning$82(com.android.tools.r8.shaking.ProguardKeepRuleBase):3836:3836 -> a
-    1590:1590:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3871:3871 -> a
-    1591:1606:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3895:3910 -> a
-    1591:1606:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3873 -> a
-    1607:1607:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3877:3877 -> a
-    1608:1608:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    1608:1608:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3878 -> a
-    1609:1619:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3879:3889 -> a
-    1620:1620:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3886:3886 -> a
-    1621:1625:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3919:3923 -> a
-    1626:1632:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3928:3934 -> a
-    1633:1640:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4036:4043 -> a
-    1633:1640:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3935 -> a
-    1641:1653:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4042:4054 -> a
-    1641:1653:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3935 -> a
+    1561:1561:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3779 -> a
+    1562:1572:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):3779:3789 -> a
+    1573:1573:void lambda$markMethodAsLive$80(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3789:3789 -> a
+    1574:1574:void lambda$traceMethodDefinitionExcludingCode$81(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):3817:3817 -> a
+    1575:1585:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3834:3844 -> a
+    1586:1588:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3843:3845 -> a
+    1589:1589:boolean lambda$checkMemberForSoftPinning$82(com.android.tools.r8.shaking.ProguardKeepRuleBase):3837:3837 -> a
+    1590:1590:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3872:3872 -> a
+    1591:1606:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3896:3911 -> a
+    1591:1606:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3874 -> a
+    1607:1607:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3878:3878 -> a
+    1608:1608:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    1608:1608:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3879 -> a
+    1609:1619:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3880:3890 -> a
+    1620:1620:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):3887:3887 -> a
+    1621:1625:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3920:3924 -> a
+    1626:1632:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3929:3935 -> a
+    1633:1640:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4037:4044 -> a
+    1633:1640:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3936 -> a
+    1641:1653:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4043:4055 -> a
+    1641:1653:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3936 -> a
     1654:1654:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1654:1654:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4056 -> a
-    1654:1654:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3935 -> a
-    1655:1657:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4057:4059 -> a
-    1655:1657:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3935 -> a
-    1658:1658:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3938:3938 -> a
-    1659:1680:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4066:4087 -> a
-    1659:1680:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3939 -> a
-    1681:1694:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4086:4099 -> a
-    1681:1694:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3939 -> a
+    1654:1654:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4057 -> a
+    1654:1654:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3936 -> a
+    1655:1657:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4058:4060 -> a
+    1655:1657:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3936 -> a
+    1658:1658:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3939:3939 -> a
+    1659:1680:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4067:4088 -> a
+    1659:1680:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3940 -> a
+    1681:1694:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4087:4100 -> a
+    1681:1694:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3940 -> a
     1695:1695:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    1695:1695:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4099 -> a
-    1695:1695:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3939 -> a
-    1696:1744:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4104:4152 -> a
-    1696:1744:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3939 -> a
+    1695:1695:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4100 -> a
+    1695:1695:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3940 -> a
+    1696:1744:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4105:4153 -> a
+    1696:1744:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3940 -> a
     1745:1745:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1745:1745:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4157 -> a
-    1745:1745:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3939 -> a
-    1746:1748:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4158:4160 -> a
-    1746:1748:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3939 -> a
-    1749:1749:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3942:3942 -> a
-    1750:1753:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4217:4220 -> a
-    1750:1753:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3943 -> a
+    1745:1745:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4158 -> a
+    1745:1745:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3940 -> a
+    1746:1748:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4159:4161 -> a
+    1746:1748:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3940 -> a
+    1749:1749:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3943:3943 -> a
+    1750:1753:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4218:4221 -> a
+    1750:1753:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3944 -> a
     1754:1754:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> a
-    1754:1754:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4221 -> a
-    1754:1754:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3943 -> a
+    1754:1754:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4222 -> a
+    1754:1754:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3944 -> a
     1755:1755:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> a
     1755:1755:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> a
-    1755:1755:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4221 -> a
-    1755:1755:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3943 -> a
-    1756:1756:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4221:4221 -> a
-    1756:1756:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3943 -> a
-    1757:1761:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3946:3950 -> a
-    1762:1768:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4227:4233 -> a
-    1762:1768:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
+    1755:1755:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4222 -> a
+    1755:1755:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3944 -> a
+    1756:1756:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4222:4222 -> a
+    1756:1756:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3944 -> a
+    1757:1761:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3947:3951 -> a
+    1762:1768:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4228:4234 -> a
+    1762:1768:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
     1769:1769:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    1769:1769:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4233 -> a
-    1769:1769:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
-    1770:1781:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4234:4245 -> a
-    1770:1781:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
-    1782:1782:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4238:4238 -> a
-    1782:1782:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
+    1769:1769:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4234 -> a
+    1769:1769:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
+    1770:1781:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4235:4246 -> a
+    1770:1781:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
+    1782:1782:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4239:4239 -> a
+    1782:1782:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
     1783:1783:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1783:1783:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4250 -> a
-    1783:1783:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
-    1784:1784:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4250:4250 -> a
-    1784:1784:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
+    1783:1783:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4251 -> a
+    1783:1783:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
+    1784:1784:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4251:4251 -> a
+    1784:1784:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
     1785:1785:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1785:1785:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4252 -> a
-    1785:1785:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
-    1786:1787:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4253:4254 -> a
-    1786:1787:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3951 -> a
-    1788:1797:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3954:3963 -> a
+    1785:1785:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4253 -> a
+    1785:1785:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
+    1786:1787:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4254:4255 -> a
+    1786:1787:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3952 -> a
+    1788:1797:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3955:3964 -> a
     1798:1798:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    1798:1798:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3963 -> a
-    1799:1803:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3964:3968 -> a
+    1798:1798:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3964 -> a
+    1799:1803:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3965:3969 -> a
     1804:1804:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1804:1804:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3972 -> a
-    1805:1805:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3972:3972 -> a
-    1806:1806:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():589:589 -> a
-    1806:1806:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3973 -> a
-    1807:1807:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
-    1807:1807:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():589 -> a
-    1807:1807:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3973 -> a
-    1808:1808:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():589:589 -> a
-    1808:1808:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3973 -> a
-    1809:1826:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3973:3990 -> a
+    1804:1804:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3973 -> a
+    1805:1805:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3973:3973 -> a
+    1806:1806:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():593:593 -> a
+    1806:1806:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3974 -> a
+    1807:1807:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
+    1807:1807:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():593 -> a
+    1807:1807:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3974 -> a
+    1808:1808:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():593:593 -> a
+    1808:1808:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3974 -> a
+    1809:1826:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3974:3991 -> a
     1827:1827:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> a
-    1827:1827:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4000 -> a
-    1828:1831:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4000:4003 -> a
+    1827:1827:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4001 -> a
+    1828:1831:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4001:4004 -> a
     1832:1832:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1832:1832:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4004 -> a
-    1833:1838:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4003:4008 -> a
+    1832:1832:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4005 -> a
+    1833:1838:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4004:4009 -> a
     1839:1839:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1839:1839:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4009 -> a
-    1840:1854:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4009:4023 -> a
+    1839:1839:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4010 -> a
+    1840:1854:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4010:4024 -> a
     1855:1855:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1855:1855:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4024 -> a
-    1856:1860:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4025:4029 -> a
-    1861:1862:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4026:4027 -> a
-    1863:1869:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4170:4176 -> a
+    1855:1855:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4025 -> a
+    1856:1860:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4026:4030 -> a
+    1861:1862:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4027:4028 -> a
+    1863:1869:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4171:4177 -> a
     1870:1870:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    1870:1870:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4176 -> a
-    1871:1887:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4181:4197 -> a
+    1870:1870:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4177 -> a
+    1871:1887:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4182:4198 -> a
     1888:1888:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    1888:1888:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4198 -> a
-    1889:1893:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4199:4203 -> a
+    1888:1888:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4199 -> a
+    1889:1893:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4200:4204 -> a
     1894:1894:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):206:206 -> a
-    1894:1894:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4203 -> a
-    1895:1896:void lambda$handleJavaLangReflectProxyNewProxyInstance$85(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4205:4206 -> a
-    1897:1908:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4261:4272 -> a
+    1894:1894:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4204 -> a
+    1895:1896:void lambda$handleJavaLangReflectProxyNewProxyInstance$85(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4206:4207 -> a
+    1897:1908:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4262:4273 -> a
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):77:77 -> b
     1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2879 -> b
     2:6:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1946:1950 -> b
@@ -74092,7 +74400,7 @@
     122:122:void lambda$traceInvokeInterface$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1248:1248 -> b
     123:123:java.lang.Boolean lambda$traceStaticFieldWrite$22(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1591:1591 -> b
     124:158:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1830:1864 -> b
-    159:159:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> b
+    159:159:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> b
     159:159:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1866 -> b
     160:160:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1867:1867 -> b
     161:161:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1678:1678 -> b
@@ -74102,7 +74410,7 @@
     163:163:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1838 -> b
     164:164:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2090:2090 -> b
     165:165:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2302:2302 -> b
-    166:166:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> b
+    166:166:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> b
     166:166:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2302 -> b
     167:172:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2302:2307 -> b
     173:174:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2534:2535 -> b
@@ -74140,50 +74448,50 @@
     237:241:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2937:2941 -> b
     242:242:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):395:395 -> b
     242:242:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2942 -> b
-    243:243:void keepClassWithRules(com.android.tools.r8.graph.DexProgramClass,java.util.Set):3014:3014 -> b
-    244:244:void keepMethodWithRules(com.android.tools.r8.graph.ProgramMethod,java.util.Set):3018:3018 -> b
-    245:249:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3191:3195 -> b
-    250:252:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3089:3091 -> b
-    250:252:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3096 -> b
-    250:252:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3195 -> b
-    253:253:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3097:3097 -> b
-    253:253:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3195 -> b
-    254:254:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3197:3197 -> b
-    255:256:void lambda$addConsequentRootSet$76(com.android.tools.r8.graph.DexReference):3553:3554 -> b
-    257:260:void lambda$addConsequentRootSet$79(com.android.tools.r8.graph.DexType,java.util.Set):3574:3577 -> b
-    261:261:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3596:3596 -> b
+    243:243:void keepClassWithRules(com.android.tools.r8.graph.DexProgramClass,java.util.Set):3015:3015 -> b
+    244:244:void keepMethodWithRules(com.android.tools.r8.graph.ProgramMethod,java.util.Set):3019:3019 -> b
+    245:249:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3192:3196 -> b
+    250:252:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3090:3092 -> b
+    250:252:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3097 -> b
+    250:252:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3196 -> b
+    253:253:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3098:3098 -> b
+    253:253:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3196 -> b
+    254:254:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3198:3198 -> b
+    255:256:void lambda$addConsequentRootSet$76(com.android.tools.r8.graph.DexReference):3554:3555 -> b
+    257:260:void lambda$addConsequentRootSet$79(com.android.tools.r8.graph.DexType,java.util.Set):3575:3578 -> b
+    261:261:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3597:3597 -> b
     262:262: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):2164:2164 -> b
-    262:262:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3596 -> b
-    263:266:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3597:3600 -> b
-    267:270:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3611:3614 -> b
-    267:270:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
+    262:262:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3597 -> b
+    263:266:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3598:3601 -> b
+    267:270:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3612:3615 -> b
+    267:270:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
     271:271:boolean com.android.tools.r8.shaking.RootSetUtils$MutableItemsWithRules.containsMethod(com.android.tools.r8.graph.DexMethod):1665:1665 -> b
-    271:271:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3614 -> b
-    271:271:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
-    272:274:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3617:3619 -> b
-    272:274:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
-    275:278:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3618:3621 -> b
-    275:278:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
-    279:282:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3620:3623 -> b
-    279:282:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
-    283:294:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3622:3633 -> b
-    283:294:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
+    271:271:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3615 -> b
+    271:271:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
+    272:274:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3618:3620 -> b
+    272:274:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
+    275:278:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3619:3622 -> b
+    275:278:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
+    279:282:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3621:3624 -> b
+    279:282:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
+    283:294:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3623:3634 -> b
+    283:294:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
     295:295:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> b
-    295:295:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3633 -> b
-    295:295:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
-    296:302:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3629:3635 -> b
-    296:302:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
+    295:295:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3634 -> b
+    295:295:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
+    296:302:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3630:3636 -> b
+    296:302:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
     303:303:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> b
-    303:303:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3635 -> b
-    303:303:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
-    304:307:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3634:3637 -> b
-    304:307:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3599 -> b
-    308:308:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3603:3603 -> b
-    309:309:boolean lambda$checkMemberForSoftPinning$83(com.android.tools.r8.shaking.ProguardKeepRuleBase):3843:3843 -> b
-    310:314:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3861:3865 -> b
-    315:315:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3864:3864 -> b
+    303:303:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3636 -> b
+    303:303:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
+    304:307:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):3635:3638 -> b
+    304:307:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3600 -> b
+    308:308:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3604:3604 -> b
+    309:309:boolean lambda$checkMemberForSoftPinning$83(com.android.tools.r8.shaking.ProguardKeepRuleBase):3844:3844 -> b
+    310:314:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3862:3866 -> b
+    315:315:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3865:3865 -> b
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> c
-    1:1:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$84(com.android.tools.r8.graph.ProgramMethod):3975 -> c
+    1:1:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$84(com.android.tools.r8.graph.ProgramMethod):3976 -> c
     2:2:com.android.tools.r8.utils.InternalOptions access$1800(com.android.tools.r8.shaking.Enqueuer):171:171 -> c
     3:7:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():467:471 -> c
     8:15:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):559:566 -> c
@@ -74236,7 +74544,7 @@
     147:153:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2219:2219 -> c
     159:175:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2225:2241 -> c
     176:180:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2680:2684 -> c
-    181:181:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():722:722 -> c
+    181:181:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():726:726 -> c
     181:181:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2684 -> c
     182:183:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2686:2687 -> c
     184:188:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2855:2859 -> c
@@ -74245,12 +74553,12 @@
     189:194:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2867 -> c
     195:201:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2867:2873 -> c
     202:202:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$58(com.android.tools.r8.graph.DexEncodedMethod):2910:2910 -> c
-    203:206:java.util.Set lambda$createEnqueuerResult$71(com.android.tools.r8.graph.DexProgramClass):3270:3273 -> c
-    207:216:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3394:3403 -> c
-    217:221:java.util.Set toDescriptorSet(java.util.Set):3409:3413 -> c
-    222:222:void lambda$addConsequentRootSet$78(com.android.tools.r8.graph.DexReference):3567:3567 -> c
-    223:247:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3649:3673 -> c
-    248:256:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3671:3679 -> c
+    203:206:java.util.Set lambda$createEnqueuerResult$71(com.android.tools.r8.graph.DexProgramClass):3271:3274 -> c
+    207:216:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3395:3404 -> c
+    217:221:java.util.Set toDescriptorSet(java.util.Set):3410:3414 -> c
+    222:222:void lambda$addConsequentRootSet$78(com.android.tools.r8.graph.DexReference):3568:3568 -> c
+    223:247:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3650:3674 -> c
+    248:256:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3672:3680 -> c
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> d
     1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1231 -> d
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> d
@@ -74260,15 +74568,15 @@
     4:4:com.android.tools.r8.shaking.Enqueuer$Mode access$400(com.android.tools.r8.shaking.Enqueuer):171:171 -> d
     5:5:com.android.tools.r8.shaking.GraphReporter getGraphReporter():463:463 -> d
     6:6:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):531:531 -> d
-    6:6:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3792 -> d
-    7:14:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3797:3804 -> d
-    15:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3914:3915 -> d
-    15:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3805 -> d
+    6:6:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3793 -> d
+    7:14:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3798:3805 -> d
+    15:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3915:3916 -> d
+    15:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3806 -> d
     17:17:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):191:191 -> d
-    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3915 -> d
-    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3805 -> d
-    18:18:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3914:3914 -> d
-    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3805 -> d
+    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3916 -> d
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3806 -> d
+    18:18:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3915:3915 -> d
+    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3806 -> d
     19:19:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):905:905 -> d
     19:19:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1553 -> d
     20:46:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1557:1583 -> d
@@ -74304,7 +74612,7 @@
     117:117:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1683:1683 -> d
     118:118:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$23(com.android.tools.r8.graph.DexType):1686:1686 -> d
     119:119:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2177:2177 -> d
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> d
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> d
     120:120:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2177 -> d
     121:121:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2178:2178 -> d
     122:122:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$49(com.android.tools.r8.graph.DexProgramClass):2610:2610 -> d
@@ -74361,8 +74669,8 @@
     38:44:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2025:2031 -> f
     38:44:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2008 -> f
     45:48:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2014:2017 -> f
-    49:51:long getNumberOfLiveItems():3517:3519 -> f
-    52:52:void traceCode(com.android.tools.r8.graph.ProgramMethod):3829:3829 -> f
+    49:51:long getNumberOfLiveItems():3518:3520 -> f
+    52:52:void traceCode(com.android.tools.r8.graph.ProgramMethod):3830:3830 -> f
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> g
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1307 -> g
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> g
@@ -74383,25 +74691,28 @@
     26:26:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1345:1345 -> g
     27:27:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1429:1429 -> g
     28:43:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2041:2056 -> g
-    44:44:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3849:3849 -> g
-    44:44:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3811 -> g
-    45:48:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3854:3857 -> g
-    45:48:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3850 -> g
-    45:48:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3811 -> g
-    49:51:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3812:3814 -> g
+    44:44:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3850:3850 -> g
+    44:44:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3812 -> g
+    45:48:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3855:3858 -> g
+    45:48:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3851 -> g
+    45:48:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3812 -> g
+    49:51:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3813:3815 -> g
     52:52:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():885:885 -> g
-    52:52:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3815 -> g
-    53:54:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3815:3816 -> g
+    52:52:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3816 -> g
+    53:54:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):3816:3817 -> g
     1:1:java.util.Set access$900(com.android.tools.r8.shaking.Enqueuer):171:171 -> h
     2:2:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1172:1172 -> h
     3:3:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1477:1477 -> h
     4:6:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1627:1629 -> h
     7:24:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2066:2083 -> h
-    25:52:void synthesize():3128:3155 -> h
+    25:52:void synthesize():3129:3156 -> h
     1:1:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1481:1481 -> i
     2:9:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2541:2548 -> i
     1:1:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1544:1544 -> j
-    2:10:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2552:2560 -> j
+    2:5:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2552:2555 -> j
+    6:6:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1678:1678 -> j
+    6:6:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2556 -> j
+    7:7:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2560:2560 -> j
     1:1:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1548:1548 -> k
     2:2:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1634:1634 -> k
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.r$a:
@@ -74411,58 +74722,58 @@
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.graph.ProgramDefinition context -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):4388:4388 -> <init>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):4399:4403 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):4389:4389 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):4400:4404 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:2:boolean addField(com.android.tools.r8.graph.DexField):4413:4414 -> b
+    1:2:boolean addField(com.android.tools.r8.graph.DexField):4414:4415 -> b
     3:3:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):239:239 -> b
-    3:3:boolean addField(com.android.tools.r8.graph.DexField):4418 -> b
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):4419 -> b
     4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):248:248 -> b
     4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):239 -> b
-    4:4:boolean addField(com.android.tools.r8.graph.DexField):4418 -> b
-    5:8:boolean addField(com.android.tools.r8.graph.DexField):4423:4426 -> b
+    4:4:boolean addField(com.android.tools.r8.graph.DexField):4419 -> b
+    5:8:boolean addField(com.android.tools.r8.graph.DexField):4424:4427 -> b
     9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():214:214 -> b
-    9:9:boolean addField(com.android.tools.r8.graph.DexField):4426 -> b
-    10:20:boolean addField(com.android.tools.r8.graph.DexField):4428:4438 -> b
-    21:27:boolean addField(com.android.tools.r8.graph.DexField):4437:4443 -> b
-    28:28:boolean addField(com.android.tools.r8.graph.DexField):4442:4442 -> b
-    29:40:boolean addMethod(com.android.tools.r8.graph.DexMethod):4451:4462 -> b
-    41:51:boolean addMethod(com.android.tools.r8.graph.DexMethod):4460:4470 -> b
-    52:52:boolean addMethod(com.android.tools.r8.graph.DexMethod):4468:4468 -> b
-    53:54:boolean addType(com.android.tools.r8.graph.DexType):4500:4501 -> b
+    9:9:boolean addField(com.android.tools.r8.graph.DexField):4427 -> b
+    10:20:boolean addField(com.android.tools.r8.graph.DexField):4429:4439 -> b
+    21:27:boolean addField(com.android.tools.r8.graph.DexField):4438:4444 -> b
+    28:28:boolean addField(com.android.tools.r8.graph.DexField):4443:4443 -> b
+    29:40:boolean addMethod(com.android.tools.r8.graph.DexMethod):4452:4463 -> b
+    41:51:boolean addMethod(com.android.tools.r8.graph.DexMethod):4461:4471 -> b
+    52:52:boolean addMethod(com.android.tools.r8.graph.DexMethod):4469:4469 -> b
+    53:54:boolean addType(com.android.tools.r8.graph.DexType):4501:4502 -> b
 com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.r$c:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
-    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4511:4512 -> <init>
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4516:4516 -> a
-    2:2:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):4516:4516 -> a
+    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4512:4513 -> <init>
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4517:4517 -> a
+    2:2:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):4517:4517 -> a
 com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.r$d:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set fields -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4314:4314 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4310:4315 -> <init>
-    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4308:4308 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4319:4322 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4326:4326 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4330:4330 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4326:4326 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4330 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4315:4315 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4311:4316 -> <init>
+    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4309:4309 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4320:4323 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4327:4327 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4331:4331 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4327:4327 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4331 -> a
 com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.r$e:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4340:4340 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4336:4341 -> <init>
-    1:1:java.util.Set access$1100(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4334:4334 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4345:4348 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4352:4352 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4356:4356 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4352:4352 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4356 -> a
-    9:9:java.util.Set getItems():4360:4360 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4341:4341 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4337:4342 -> <init>
+    1:1:java.util.Set access$1100(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4335:4335 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4346:4349 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4353:4353 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4357:4357 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4353:4353 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4357 -> a
+    9:9:java.util.Set getItems():4361:4361 -> a
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.r$f:
     com.android.tools.r8.shaking.Enqueuer$Mode GENERATE_MAIN_DEX_LIST -> e
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_MAIN_DEX_TRACING -> d
@@ -74484,25 +74795,25 @@
 com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey -> com.android.tools.r8.shaking.r$g:
     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):4520:4520 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):4525:4527 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$2500(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4520:4520 -> a
-    1:1:boolean access$2600(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4520:4520 -> b
-    1:5:boolean equals(java.lang.Object):4532:4536 -> equals
-    1:1:int hashCode():4541:4541 -> hashCode
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):4521:4521 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):4526:4528 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$2500(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4521:4521 -> a
+    1:1:boolean access$2600(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4521:4521 -> b
+    1:5:boolean equals(java.lang.Object):4533:4537 -> equals
+    1:1:int hashCode():4542:4542 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.r$h:
     java.util.Map deferredActions -> b
     java.util.Set items -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():4277:4277 -> <clinit>
-    1:4:void <init>():4277:4280 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4277:4277 -> <init>
-    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4277:4277 -> a
-    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4283:4285 -> a
-    5:5:boolean contains(java.lang.Object):4292:4292 -> a
-    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4296:4297 -> a
-    8:8:java.util.Set getItems():4304:4304 -> a
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4297:4297 -> b
+    1:1:void <clinit>():4278:4278 -> <clinit>
+    1:4:void <init>():4278:4281 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4278:4278 -> <init>
+    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4278:4278 -> a
+    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4284:4286 -> a
+    5:5:boolean contains(java.lang.Object):4293:4293 -> a
+    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4297:4298 -> a
+    8:8:java.util.Set getItems():4305:4305 -> a
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4298:4298 -> b
 com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.r$i:
     java.util.Map methodProcessingContexts -> b
     java.util.Map liveMethods -> d
@@ -74511,19 +74822,19 @@
     boolean $assertionsDisabled -> g
     java.util.Map syntheticClasspathClasses -> e
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> a
-    1:1:void <clinit>():3049:3049 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3065:3065 -> <init>
-    2:16:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3052:3066 -> <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):3071:3071 -> a
-    2:6:boolean isEmpty():3075:3079 -> a
-    7:8:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3084:3085 -> a
-    9:11:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3089:3091 -> a
-    12:16:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3106:3110 -> a
+    1:1:void <clinit>():3050:3050 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3066:3066 -> <init>
+    2:16:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3053:3067 -> <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):3072:3072 -> a
+    2:6:boolean isEmpty():3076:3080 -> a
+    7:8:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3085:3086 -> a
+    9:11:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3090:3092 -> a
+    12:16:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3107:3111 -> a
     17:17:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():73:73 -> a
-    17:17:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3110 -> a
-    18:29:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3112:3123 -> a
-    30:30:void lambda$enqueueWorkItems$1(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3117:3117 -> a
-    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3070:3070 -> b
+    17:17:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3111 -> a
+    18:29:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3113:3124 -> a
+    30:30:void lambda$enqueueWorkItems$1(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3118:3118 -> a
+    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3071:3071 -> b
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.s:
     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
@@ -74532,13 +74843,13 @@
     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
     1:1: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 -> c
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.tb:
+com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.ub:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
 com.android.tools.r8.shaking.EnqueuerResult -> com.android.tools.r8.shaking.t:
     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.ub:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.vb:
     com.android.tools.r8.graph.UseRegistry create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer) -> a
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.v:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
@@ -74554,11 +74865,11 @@
     6:6:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):314:314 -> a
     7:7:void enqueueMarkFieldAsReachableAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):319:319 -> 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):329:329 -> a
-    9:9:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
+    9:9:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> 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):329 -> 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):329:331 -> a
     13:13:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):335:335 -> a
-    14:14:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> a
+    14:14:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> a
     14:14:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):335 -> a
     15:17:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):335:337 -> a
     18:21:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):348:351 -> a
@@ -74569,7 +74880,7 @@
     26:26:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):383:383 -> a
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():298:298 -> b
     2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):341:341 -> b
-    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():597:597 -> b
+    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():601:601 -> b
     3:3:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):341 -> b
     4:6:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):341:343 -> b
     7:7:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):375:375 -> b
@@ -74707,7 +75018,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.Oc:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.Pc:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -74726,7 +75037,7 @@
     1:1:boolean com.android.tools.r8.shaking.FilteredClassPath.isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Qd:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.le:
 com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.P:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map annotationNodes -> d
@@ -74756,7 +75067,7 @@
     52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):168 -> a
     58:58:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):171:171 -> a
     59:59:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:175 -> a
-    60:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():722:722 -> a
+    60:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():726:726 -> a
     60:60:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175 -> a
     61:61:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):176:176 -> a
     62:67:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:180 -> a
@@ -74862,12 +75173,12 @@
     116:116:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):199 -> a
     117:130:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):202:215 -> a
     131:132:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222:223 -> a
-    133:133:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():625:625 -> a
+    133:133:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():629:629 -> a
     133:133:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):224 -> a
     134:141:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):224:231 -> a
     142:155:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):229:242 -> a
     156:185:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):240:269 -> a
-    186:186:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():625:625 -> a
+    186:186:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():629:629 -> a
     186:186:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):275 -> a
     187:188:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):275:276 -> a
     189:192:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):235:238 -> a
@@ -74944,7 +75255,7 @@
     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.pg:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.Kg:
     com.android.tools.r8.shaking.InstantiationReason REFERENCED_IN_METHOD_HANDLE -> d
     com.android.tools.r8.shaking.InstantiationReason REFLECTION -> e
     com.android.tools.r8.shaking.InstantiationReason LAMBDA -> b
@@ -75044,7 +75355,7 @@
     6:9:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):29:32 -> <init>
     10:10:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):28:28 -> <init>
     1:1:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77:77 -> a
-    2:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():611:612 -> a
+    2:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():614:615 -> a
     2:3:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77 -> a
     4:4:boolean internalIsAccessModificationAllowed():82:82 -> a
     4:4:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77 -> a
@@ -75058,7 +75369,7 @@
     1:1:boolean internalIsAccessModificationRequiredForRepackaging():65:65 -> b
     2:2:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):89:89 -> b
     1:1:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49:49 -> c
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> c
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> c
     2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49 -> c
     3:3:boolean internalIsMinificationAllowed():53:53 -> c
     3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49 -> c
@@ -75389,7 +75700,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):142:142 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):145:145 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():150:150 -> a
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.Pn:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.mo:
     java.util.List pruned -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):32:32 -> <init>
@@ -75400,7 +75711,7 @@
     9:21:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48 -> a
     22:22:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):51:51 -> a
     23:31:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):49:57 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.Lo:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.ip:
     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
@@ -75433,7 +75744,7 @@
     8:12:void logResults():162:166 -> b
     13:20:void logResults():163:170 -> b
     21:27:void logResults():167:173 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.Ko:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.hp:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():184:184 -> <clinit>
     1:1:void <init>():187:187 -> <init>
@@ -75441,9 +75752,9 @@
     2:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):199:201 -> a
     5:27:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration.isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):211:233 -> a
     5:27:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):200 -> a
-com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.Oo:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.lp:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.Tp:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.qq:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> c
     java.util.function.Consumer consumer -> d
@@ -75470,8 +75781,8 @@
     23:23:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):90:90 -> a
     24:28:void lambda$getFirstReferenceOutsideFromCode$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):81:85 -> a
     29:32:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):98:101 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.Qp:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.Rp:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.nq:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.oq:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):187:187 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):187:187 -> <init>
@@ -75482,7 +75793,7 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):197:198 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):204:205 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):225:225 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.pq:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):105:105 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):107:108 -> <init>
@@ -75526,7 +75837,7 @@
     17:17:boolean isSyntheticContextOnMainDexList(com.android.tools.r8.graph.DexType):81:81 -> a
     18:18:boolean isFromList(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):90:90 -> a
     18:18:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):160 -> a
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     19:19:boolean isFromList(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):90 -> a
     19:19:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):160 -> a
     20:20:boolean isFromList(com.android.tools.r8.graph.DexReference,com.android.tools.r8.synthesis.SyntheticItems):94:94 -> a
@@ -75546,10 +75857,10 @@
     30:31:boolean isTracedMethodRoot(com.android.tools.r8.graph.DexMethod):102:103 -> a
     32:41:boolean isContainedOrHasContainedContext(com.android.tools.r8.graph.DexReference,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):112:121 -> a
     42:42:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):165:165 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     43:43:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):165 -> a
     44:44:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):165:165 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     45:45:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):165 -> a
     46:53:boolean canMerge(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference,com.android.tools.r8.synthesis.SyntheticItems):169:176 -> a
     46:53:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):165 -> a
@@ -75588,7 +75899,7 @@
     3:3:boolean isFromList(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):90:90 -> b
     3:3:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):160 -> b
     3:3:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMergeKey(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):180 -> b
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> b
     4:4:boolean isFromList(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):90 -> b
     4:4:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):160 -> b
     4:4:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMergeKey(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):180 -> b
@@ -75599,7 +75910,7 @@
     6:6:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMergeKey(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):180:180 -> b
     7:7:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMainDexGroupInternal(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):187:187 -> b
     7:7:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMergeKey(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):181 -> b
-    8:8:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():625:625 -> b
+    8:8:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():629:629 -> b
     8:8:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMainDexGroupInternal(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):187 -> b
     8:8:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMergeKey(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):181 -> b
     9:9:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMainDexGroupInternal(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):187:187 -> b
@@ -75609,7 +75920,7 @@
     12:12:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexType):284:284 -> b
     13:17:com.android.tools.r8.shaking.MainDexInfo$Builder builderFromCopy():404:408 -> b
     1:1:boolean isTracedRoot(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):98:98 -> c
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> c
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> c
     2:2:boolean isTracedRoot(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):98 -> c
     3:3:boolean isTracedRoot(com.android.tools.r8.graph.DexReference,com.android.tools.r8.synthesis.SyntheticItems):107:107 -> c
     3:3:boolean isTracedRoot(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):98 -> c
@@ -75660,7 +75971,7 @@
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_DEPENDENCY -> c
     1:4:void <clinit>():37:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):36:36 -> <init>
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.Up:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.rq:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexInfo$Builder mainDexInfoBuilder -> d
@@ -75709,7 +76020,7 @@
     7:14:void com.android.tools.r8.shaking.MainDexListBuilder.addAnnotationsWithEnum(com.android.tools.r8.graph.DexProgramClass):143:150 -> d
     7:14:void traceRuntimeAnnotationsWithEnumForMainDex():79 -> d
     15:15:void traceRuntimeAnnotationsWithEnumForMainDex():84:84 -> d
-    16:22:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):290:296 -> d
+    16:22:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):294:300 -> d
     16:22:void traceRuntimeAnnotationsWithEnumForMainDex():84 -> d
 com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.D0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> r
@@ -75796,12 +76107,12 @@
     13:13:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):254:254 -> b
     14:15:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):265:266 -> b
     14:15:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):254 -> b
-    16:16:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJavaConversionTypes():491:491 -> b
+    16:16:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJavaConversionTypes():493:493 -> b
     16:16:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):274 -> b
     16:16:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):254 -> b
     17:17:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):274:274 -> b
     17:17:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):254 -> b
-    18:18:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJ$ConversionTypes():500:500 -> b
+    18:18:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJ$ConversionTypes():502:502 -> b
     18:18:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):275 -> b
     18:18:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):254 -> b
     19:20:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):275:276 -> b
@@ -75842,7 +76153,7 @@
     1:1:void <init>(com.android.tools.r8.shaking.NoVerticalClassMergingRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.zw:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.Tw:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -77476,7 +77787,7 @@
     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.Aw:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.Uw:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -77604,7 +77915,7 @@
     1:1:void <init>():50:50 -> <init>
     2:2:void <init>():47:47 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.Bw:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.Vw:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -77894,7 +78205,7 @@
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.Dw:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.Xw:
     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
@@ -77981,7 +78292,7 @@
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.Ew:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.Yw:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -78541,7 +78852,7 @@
     21:26:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):297:302 -> a
     27:61:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):309:343 -> a
     62:65:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):342:345 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> a
     66:66:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):345 -> a
     67:98:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):345:376 -> a
     99:99:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):325:325 -> a
@@ -78593,7 +78904,7 @@
     389:389:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1050 -> a
     390:390:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1052:1052 -> a
     391:409:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1056:1074 -> a
-    410:410:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> a
+    410:410:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> a
     410:410:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1074 -> a
     411:411:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1075:1075 -> a
     412:413:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1100:1101 -> a
@@ -78607,7 +78918,7 @@
     441:449:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1131 -> a
     450:456:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1132:1132 -> a
     470:509:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1146:1185 -> a
-    510:510:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> a
+    510:510:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> a
     510:510:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1185 -> a
     511:515:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1185:1189 -> a
     516:520:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1080:1084 -> a
@@ -78729,7 +79040,7 @@
     56:56:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):627 -> a
     57:59:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):635:637 -> a
     60:60:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):636:636 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.kB:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.LB:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -78741,7 +79052,7 @@
     3:3:boolean com.android.tools.r8.shaking.RuntimeTypeCheckInfo.isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):93 -> a
     4:7:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):97:100 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.kB$a:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.LB$a:
     java.util.Set checkCastTypes -> c
     java.util.Set exceptionGuardTypes -> d
     java.util.Set instanceOfTypes -> b
@@ -78780,7 +79091,7 @@
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult NOT_ADDED -> a
     1:3:void <clinit>():17:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.HC:
     java.util.Map cache -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -78793,90 +79104,108 @@
     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.bF:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.shaking.V1:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
     com.android.tools.r8.shaking.TreePrunerConfiguration configuration -> b
-    boolean $assertionsDisabled -> f
     com.android.tools.r8.shaking.UnusedItemsPrinter unusedItemsPrinter -> c
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):43:43 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):46:46 -> <init>
-    3:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):39:56 -> <init>
-    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):54:54 -> a
-    2:3:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):75:76 -> a
-    4:27:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.List):80:103 -> a
-    4:27:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):76 -> a
-    28:39:void com.android.tools.r8.shaking.TreePruner.pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):122:133 -> a
-    28:39:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.List):106 -> a
-    28:39:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):76 -> a
-    40:50:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.List):107:117 -> a
-    40:50:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):76 -> a
-    51:51:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):76:76 -> a
-    52:63:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):139:150 -> a
-    64:65:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):168:169 -> a
-    66:71:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):37:42 -> a
-    66:71:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272 -> a
-    66:71:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    72:72:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272:272 -> a
-    72:72:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    73:76:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171:174 -> a
-    77:82:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):37:42 -> a
-    77:82:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272 -> a
-    77:82:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):174 -> a
-    83:83:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):272:272 -> a
-    83:83:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):174 -> a
-    84:95:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):176:187 -> a
-    96:103:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):194:201 -> a
-    96:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
-    104:120:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):226:242 -> a
-    104:120:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):202 -> a
-    104:120:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188 -> a
-    121:122:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):189:190 -> a
-    123:127:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):378:382 -> a
-    123:127:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
-    128:128:boolean isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> a
-    129:130:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):218:219 -> a
-    131:132:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):221:222 -> a
-    133:135:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):248:250 -> a
-    136:136:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254:254 -> a
-    137:137:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):208:208 -> a
-    137:137:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254 -> a
-    138:141:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):254:257 -> a
-    142:142:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):208:208 -> a
-    142:142:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):258 -> a
-    143:143:boolean com.android.tools.r8.shaking.TreePruner.isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> a
-    143:143:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):258 -> a
-    144:145:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):263:264 -> a
-    146:167:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):276:297 -> a
-    168:188:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):294:314 -> a
-    189:189:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
-    189:189:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315 -> a
-    190:198:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315:323 -> a
-    199:210:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):322:333 -> a
-    211:211:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):279:279 -> a
-    212:241:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):337:366 -> a
-    242:242:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):339:339 -> a
-    243:243:java.util.Collection getMethodsToKeepForConfigurationDebugging():374:374 -> a
-    1:1:boolean com.android.tools.r8.shaking.TreePruner.isTypeLive(com.android.tools.r8.graph.DexType):212:212 -> b
-    1:1:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):155 -> b
-    2:8:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):156:162 -> b
-    9:9:java.util.Set getRemovedClasses():370:370 -> b
-    1:10:com.android.tools.r8.graph.DirectMappedDexApplication run():60:69 -> c
-com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.cF:
+    boolean $assertionsDisabled -> g
+    com.android.tools.r8.graph.GenericSignatureTypeVariableRemover typeVariableRemover -> f
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):52:52 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):55:55 -> <init>
+    3:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):47:66 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.shaking.TreePruner):42:42 -> a
+    2:2:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):63:63 -> a
+    3:11:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):74:82 -> a
+    12:16:void fixupOptimizationInfo(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService):399:403 -> a
+    12:16:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):83 -> a
+    17:34:void fixupOptimizationInfo(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService):402:419 -> a
+    17:34:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):83 -> a
+    35:35:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):86:86 -> a
+    36:37:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):92:93 -> a
+    38:49:java.util.List getNewProgramClasses(java.util.List):97:108 -> a
+    38:49:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):93 -> a
+    50:50:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> a
+    50:50:java.util.List getNewProgramClasses(java.util.List):112 -> a
+    50:50:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):93 -> a
+    51:53:java.util.List getNewProgramClasses(java.util.List):118:120 -> a
+    51:53:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):93 -> a
+    54:65:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):139:150 -> a
+    54:65:java.util.List getNewProgramClasses(java.util.List):123 -> a
+    54:65:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):93 -> a
+    66:76:java.util.List getNewProgramClasses(java.util.List):124:134 -> a
+    66:76:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):93 -> a
+    77:77:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):93:93 -> a
+    78:89:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):156:167 -> a
+    90:91:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):185:186 -> a
+    92:97:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):37:42 -> a
+    92:97:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):290 -> a
+    92:97:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):186 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):290:290 -> a
+    98:98:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):186 -> a
+    99:102:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):188:191 -> a
+    103:108:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):37:42 -> a
+    103:108:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):290 -> a
+    103:108:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):191 -> a
+    109:109:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):290:290 -> a
+    109:109:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):191 -> a
+    110:122:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):193:205 -> a
+    123:130:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):212:219 -> a
+    123:130:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):206 -> a
+    131:147:void claimNestOwnership(com.android.tools.r8.graph.DexClass):244:260 -> a
+    131:147:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):220 -> a
+    131:147:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):206 -> a
+    148:149:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):207:208 -> a
+    150:154:boolean verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):423:427 -> a
+    150:154:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):208 -> a
+    155:155:boolean isTypeLive(com.android.tools.r8.graph.DexType):230:230 -> a
+    156:157:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):236:237 -> a
+    158:159:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):239:240 -> a
+    160:162:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):266:268 -> a
+    163:163:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):272:272 -> a
+    164:164:boolean isTypeMissing(com.android.tools.r8.graph.DexType):226:226 -> a
+    164:164:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):272 -> a
+    165:168:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):272:275 -> a
+    169:169:boolean isTypeMissing(com.android.tools.r8.graph.DexType):226:226 -> a
+    169:169:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):276 -> a
+    170:170:boolean isTypeLive(com.android.tools.r8.graph.DexType):230:230 -> a
+    170:170:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):276 -> a
+    171:172:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):281:282 -> a
+    173:194:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):294:315 -> a
+    195:215:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):312:332 -> a
+    216:216:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    216:216:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):333 -> a
+    217:225:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):333:341 -> a
+    226:237:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):340:351 -> a
+    238:238:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):297:297 -> a
+    239:268:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):355:384 -> a
+    269:269:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):357:357 -> a
+    270:270:java.util.Collection getMethodsToKeepForConfigurationDebugging():392:392 -> a
+    1:1:java.util.Set access$100(com.android.tools.r8.shaking.TreePruner):42:42 -> b
+    2:2:boolean isTypeLive(com.android.tools.r8.graph.DexType):230:230 -> b
+    2:2:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):172 -> b
+    3:9:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):173:179 -> b
+    10:10:java.util.Set getRemovedClasses():388:388 -> b
+com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.shaking.U1:
+    com.android.tools.r8.shaking.TreePruner this$0 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.TreePruner):405:405 -> <init>
+    1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):408:408 -> a
+    2:2:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):414:414 -> a
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.DF:
     boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.W1:
+com.android.tools.r8.shaking.UnusedArgumentRule -> 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.UnusedArgumentRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():79:79 -> B
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.shaking.U1:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.V1:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.shaking.W1:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.X1:
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.jG:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.shaking.c2:
     com.android.tools.r8.shaking.UnusedItemsPrinter DONT_PRINT -> e
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> c
     java.util.List classes -> d
@@ -78889,55 +79218,55 @@
     1:2:void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass):48:49 -> a
     3:17:void finished():76:90 -> a
     18:18:int lambda$finished$0(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):76:76 -> a
-    19:19:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    19:19:void append(java.lang.String):94:94 -> a
     19:19:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):123 -> a
     20:21:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):124:125 -> a
-    22:22:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    22:22:void append(java.lang.String):94:94 -> a
     22:22:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):126 -> a
-    23:23:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    23:23:void append(java.lang.String):94:94 -> a
     23:23:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):127 -> a
     24:24:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):129:129 -> a
-    25:25:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    25:25:void append(java.lang.String):94:94 -> a
     25:25:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):129 -> a
-    26:26:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    26:26:void append(java.lang.String):94:94 -> a
     26:26:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):130 -> a
     27:27:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):131:131 -> a
-    28:28:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    28:28:void append(java.lang.String):94:94 -> a
     28:28:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):131 -> a
-    29:29:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98:98 -> a
+    29:29:void newline():98:98 -> a
     29:29:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):132 -> a
-    30:30:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
-    30:30:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98 -> a
+    30:30:void append(java.lang.String):94:94 -> a
+    30:30:void newline():98 -> a
     30:30:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):132 -> a
-    31:31:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    31:31:void append(java.lang.String):94:94 -> a
     31:31:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):102 -> a
     32:33:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):103:104 -> a
-    34:34:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    34:34:void append(java.lang.String):94:94 -> a
     34:34:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):105 -> a
-    35:35:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    35:35:void append(java.lang.String):94:94 -> a
     35:35:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):106 -> a
     36:36:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):108:108 -> a
-    37:37:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    37:37:void append(java.lang.String):94:94 -> a
     37:37:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):108 -> a
-    38:38:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    38:38:void append(java.lang.String):94:94 -> a
     38:38:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):109 -> a
     39:39:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):110:110 -> a
-    40:40:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    40:40:void append(java.lang.String):94:94 -> a
     40:40:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):110 -> a
-    41:41:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    41:41:void append(java.lang.String):94:94 -> a
     41:41:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):111 -> a
     42:42:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):112:112 -> a
-    43:43:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    43:43:void append(java.lang.String):94:94 -> a
     43:43:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):114 -> a
     44:44:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):116:116 -> a
-    45:45:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    45:45:void append(java.lang.String):94:94 -> a
     45:45:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):116 -> a
-    46:46:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    46:46:void append(java.lang.String):94:94 -> a
     46:46:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):118 -> a
-    47:47:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98:98 -> a
+    47:47:void newline():98:98 -> a
     47:47:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):119 -> a
-    48:48:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
-    48:48:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98 -> a
+    48:48:void append(java.lang.String):94:94 -> a
+    48:48:void newline():98 -> a
     48:48:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):119 -> a
     1:2:void visiting(com.android.tools.r8.graph.DexProgramClass):54:55 -> b
     3:3:void visited():60:60 -> b
@@ -78946,8 +79275,8 @@
     5:8:void visited():61:64 -> b
     9:9:void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> b
     10:10:void registerUnusedField(com.android.tools.r8.graph.DexEncodedField):72:72 -> b
-com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.gG:
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.hG:
+com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.shaking.Z1:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.shaking.a2:
     java.util.List methods -> b
     java.util.List fields -> a
     1:3:void <init>():18:20 -> <init>
@@ -78955,7 +79284,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.iG:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.shaking.b2:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -78963,7 +79292,7 @@
     void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void visited() -> b
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.shaking.g2:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.shaking.m2:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> k
     boolean $assertionsDisabled -> p
@@ -78980,115 +79309,115 @@
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> d
     java.util.List synthesizedBridges -> n
     java.util.Set pinnedTypes -> l
-    1:1:void <clinit>():99:99 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):228:228 -> <init>
-    2:39:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):204:241 -> <init>
-    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> a
-    2:20:void initializeMergeCandidates(java.lang.Iterable):245:263 -> a
-    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):326:335 -> a
-    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):343:354 -> a
+    1:1:void <clinit>():100:100 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):229:229 -> <init>
+    2:39:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):205:242 -> <init>
+    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> a
+    2:20:void initializeMergeCandidates(java.lang.Iterable):246:264 -> a
+    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):327:336 -> a
+    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):344:355 -> a
     43:43:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):354 -> a
-    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):354:354 -> a
-    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):358:360 -> a
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):355 -> a
+    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):355:355 -> a
+    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):359:361 -> a
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     54:54:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128 -> a
     54:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):182 -> a
-    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):360 -> a
+    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
     55:55:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128:128 -> a
     55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):182 -> a
-    55:55:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):360 -> a
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():672:672 -> a
+    55:55:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():668:668 -> a
     56:56:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128 -> a
     56:56:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):182 -> a
-    56:56:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):360 -> a
+    56:56:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
     57:57:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):128:128 -> a
     57:57:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):182 -> a
-    57:57:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):360 -> a
-    58:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):363:371 -> a
+    57:57:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361 -> a
+    58:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):364:372 -> a
     67:67:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):376:376 -> a
-    67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):372 -> a
-    68:98:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):384:414 -> a
-    99:100:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405:406 -> a
-    101:147:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):425:471 -> a
-    148:166:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):864:882 -> a
-    148:166:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):477 -> a
-    167:167:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):881:881 -> a
-    167:167:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):477 -> a
-    168:169:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):478:479 -> a
-    170:171:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):464:465 -> a
-    172:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):444:445 -> a
-    174:174:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):440:440 -> a
-    175:180:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):528:533 -> a
-    181:202:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():638:659 -> a
+    67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):373 -> a
+    68:98:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385:415 -> a
+    99:100:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406:407 -> a
+    101:147:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):426:472 -> a
+    148:166:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):865:883 -> a
+    148:166:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):478 -> a
+    167:167:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):882:882 -> a
+    167:167:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):478 -> a
+    168:169:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):479:480 -> a
+    170:171:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):465:466 -> a
+    172:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):445:446 -> a
+    174:174:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):441:441 -> a
+    175:180:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):529:534 -> a
+    181:202:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():639:660 -> a
     203:203:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):444:444 -> a
-    203:203:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():659 -> a
-    204:207:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():660:663 -> a
-    208:208:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):659:659 -> a
-    209:214:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):694:699 -> a
+    203:203:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():660 -> a
+    204:207:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():661:664 -> a
+    208:208:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):660:660 -> a
+    209:214:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):695:700 -> a
     215:215:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):293:293 -> a
-    215:215:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):700 -> a
-    216:235:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):703:722 -> a
-    236:242:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):778:784 -> a
-    243:243:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):789:789 -> a
-    244:295:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):801:852 -> a
-    296:306:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):848:858 -> a
-    307:307:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):854:854 -> a
-    308:308:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):839:839 -> a
-    309:312:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1459:1462 -> a
-    309:312:void access$1100(com.android.tools.r8.graph.DexEncodedMethod):99 -> a
-    313:322:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1655:1664 -> a
-    313:322:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):388 -> a
-    323:334:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1660:1671 -> a
-    323:334:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):388 -> a
-    335:343:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1670:1678 -> a
-    335:343:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):388 -> a
-    344:349:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):391:396 -> a
-    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> b
-    2:6:void initializePinnedTypes(java.lang.Iterable):273:277 -> b
-    7:8:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):302:303 -> b
-    7:8:void initializePinnedTypes(java.lang.Iterable):277 -> b
+    215:215:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):701 -> a
+    216:235:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):704:723 -> a
+    236:242:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):779:785 -> a
+    243:243:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):790:790 -> a
+    244:295:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):802:853 -> a
+    296:306:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):849:859 -> a
+    307:307:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):855:855 -> a
+    308:308:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):840:840 -> a
+    309:312:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1460:1463 -> a
+    309:312:void access$1100(com.android.tools.r8.graph.DexEncodedMethod):100 -> a
+    313:322:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1656:1665 -> a
+    313:322:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):389 -> a
+    323:334:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1661:1672 -> a
+    323:334:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):389 -> a
+    335:343:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1671:1679 -> a
+    335:343:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):389 -> a
+    344:349:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):392:397 -> a
+    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> b
+    2:6:void initializePinnedTypes(java.lang.Iterable):274:278 -> b
+    7:8:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):303:304 -> b
+    7:8:void initializePinnedTypes(java.lang.Iterable):278 -> b
     9:9:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
-    9:9:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):303 -> b
-    9:9:void initializePinnedTypes(java.lang.Iterable):277 -> b
-    10:25:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):304:319 -> b
-    10:25:void initializePinnedTypes(java.lang.Iterable):277 -> b
-    26:44:void initializePinnedTypes(java.lang.Iterable):279:297 -> b
-    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):487:487 -> b
-    46:46:boolean com.android.tools.r8.graph.DexClass.isPrivate():661:661 -> b
-    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):491 -> b
-    47:47:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> b
-    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):491 -> b
-    48:48:boolean com.android.tools.r8.graph.DexClass.isPrivate():661:661 -> b
-    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492 -> b
-    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> b
-    49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492 -> b
-    50:50:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> b
-    50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):501 -> b
-    51:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504:509 -> b
+    9:9:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):304 -> b
+    9:9:void initializePinnedTypes(java.lang.Iterable):278 -> b
+    10:25:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):305:320 -> b
+    10:25:void initializePinnedTypes(java.lang.Iterable):278 -> b
+    26:44:void initializePinnedTypes(java.lang.Iterable):280:298 -> b
+    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):488:488 -> b
+    46:46:boolean com.android.tools.r8.graph.DexClass.isPrivate():665:665 -> b
+    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492 -> b
+    47:47:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> b
+    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):492 -> b
+    48:48:boolean com.android.tools.r8.graph.DexClass.isPrivate():665:665 -> b
+    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
+    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> b
+    49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
+    50:50:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> b
+    50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502 -> b
+    51:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505:510 -> b
     57:57:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
-    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):510 -> b
-    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):510:510 -> b
+    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511 -> b
+    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511:511 -> b
     59:59:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
-    59:59:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):514 -> b
-    60:60:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515:515 -> b
+    59:59:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515 -> b
+    60:60:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516:516 -> b
     61:61:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
-    61:61:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516 -> b
-    62:73:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):524:535 -> b
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> c
-    2:64:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):729:791 -> c
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1200(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> d
-    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1300(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> e
-    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> f
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1500(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> g
-    1:4:java.util.Collection getInvokes():539:542 -> h
-    1:4:java.util.Collection access$1600(com.android.tools.r8.shaking.VerticalClassMerger):99 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> i
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> j
-    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> k
-    1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):99:99 -> l
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.X1:
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.Y1:
+    61:61:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):517 -> b
+    62:73:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):525:536 -> b
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> c
+    2:64:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):730:792 -> c
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1200(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> d
+    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1300(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> e
+    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> f
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1500(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> g
+    1:4:java.util.Collection getInvokes():540:543 -> h
+    1:4:java.util.Collection access$1600(com.android.tools.r8.shaking.VerticalClassMerger):100 -> h
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> i
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> j
+    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> k
+    1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):100:100 -> l
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.d2:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.e2:
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> h
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> g
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MERGE_ACROSS_NESTS -> f
@@ -79109,51 +79438,51 @@
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> i
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSUPPORTED_ATTRIBUTES -> r
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSAFE_INLINING -> q
-    1:20:void <clinit>():101:101 -> <clinit>
-    1:1:void <init>(java.lang.String,int):101:101 -> <init>
-    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122:122 -> a
-    2:58:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):127:183 -> a
-    2:58:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    59:59:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):180:180 -> a
-    59:59:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    60:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):177:177 -> a
-    60:60:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    61:61:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):174:174 -> a
-    61:61:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    62:62:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):171:171 -> a
-    62:62:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    63:63:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):168:168 -> a
-    63:63:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    64:64:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):165:165 -> a
-    64:64:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    65:65:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):162:162 -> a
-    65:65:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    66:66:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):159:159 -> a
-    66:66:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    67:67:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):156:156 -> a
-    67:67:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    68:68:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):153:153 -> a
-    68:68:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    69:69:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):150:150 -> a
-    69:69:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    70:70:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
-    70:70:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    71:71:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):144:144 -> a
-    71:71:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    72:72:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):141:141 -> a
-    72:72:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    73:73:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):138:138 -> a
-    73:73:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    74:74:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):135:135 -> a
-    74:74:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    75:75:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):132:132 -> a
-    75:75:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    76:132:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):129:185 -> a
-    76:132:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-    133:133:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122:122 -> a
-    134:134:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):183:183 -> a
-    134:134:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):122 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.Z1:
+    1:20:void <clinit>():102:102 -> <clinit>
+    1:1:void <init>(java.lang.String,int):102:102 -> <init>
+    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123:123 -> a
+    2:58:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):128:184 -> a
+    2:58:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    59:59:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):181:181 -> a
+    59:59:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    60:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):178:178 -> a
+    60:60:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    61:61:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):175:175 -> a
+    61:61:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    62:62:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):172:172 -> a
+    62:62:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    63:63:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):169:169 -> a
+    63:63:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    64:64:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):166:166 -> a
+    64:64:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    65:65:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):163:163 -> a
+    65:65:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    66:66:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):160:160 -> a
+    66:66:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    67:67:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):157:157 -> a
+    67:67:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    68:68:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):154:154 -> a
+    68:68:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    69:69:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):151:151 -> a
+    69:69:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    70:70:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):148:148 -> a
+    70:70:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    71:71:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):145:145 -> a
+    71:71:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    72:72:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):142:142 -> a
+    72:72:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    73:73:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):139:139 -> a
+    73:73:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    74:74:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):136:136 -> a
+    74:74:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    75:75:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):133:133 -> a
+    75:75:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    76:132:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):130:186 -> a
+    76:132:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+    133:133:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123:123 -> a
+    134:134:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):184:184 -> a
+    134:134:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):123 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.f2:
     com.android.tools.r8.graph.DexProgramClass target -> b
     java.util.List synthesizedBridges -> d
     com.android.tools.r8.graph.DexProgramClass source -> a
@@ -79161,119 +79490,119 @@
     boolean $assertionsDisabled -> g
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> f
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder deferredRenamings -> c
-    1:1:void <clinit>():893:893 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):893:893 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):903:903 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):897:905 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):920:923 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1005:1007 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1006:1006 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1069:1069 -> a
-    10:22:boolean restoreDebuggingState(java.util.stream.Stream):1118:1130 -> a
-    23:23:boolean restoreDebuggingState(java.util.stream.Stream):1129:1129 -> a
-    24:25:void lambda$restoreDebuggingState$3(com.android.tools.r8.graph.DexEncodedMethod):1120:1121 -> a
-    26:26:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1135:1135 -> a
-    27:89:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1143:1205 -> a
-    90:90:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1153:1153 -> a
-    91:94:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1327:1330 -> a
-    95:106:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1429:1440 -> a
-    95:106:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1331 -> a
-    107:113:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1439:1445 -> a
-    107:113:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1331 -> a
-    114:115:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1332:1333 -> a
+    1:1:void <clinit>():894:894 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):894:894 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):904:904 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):898:906 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):921:924 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1006:1008 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1007:1007 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1070:1070 -> a
+    10:22:boolean restoreDebuggingState(java.util.stream.Stream):1119:1131 -> a
+    23:23:boolean restoreDebuggingState(java.util.stream.Stream):1130:1130 -> a
+    24:25:void lambda$restoreDebuggingState$3(com.android.tools.r8.graph.DexEncodedMethod):1121:1122 -> a
+    26:26:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1136:1136 -> a
+    27:89:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1144:1206 -> a
+    90:90:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1154:1154 -> a
+    91:94:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1328:1331 -> a
+    95:106:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1430:1441 -> a
+    95:106:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1332 -> a
+    107:113:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1440:1446 -> a
+    107:113:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1332 -> a
+    114:115:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1333:1334 -> a
     116:116:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
-    116:116:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1333 -> a
-    117:122:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1334:1339 -> a
-    123:127:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1348:1352 -> a
-    128:128:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1383:1383 -> a
-    129:157:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1393:1421 -> a
-    158:182:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1400:1424 -> a
-    1:2:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1125:1126 -> b
-    3:3:java.util.List getSynthesizedBridges():1139:1139 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1175:1175 -> b
-    1:2:boolean merge():912:913 -> c
-    3:4:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1310:1311 -> c
-    3:4:boolean merge():913 -> c
-    5:17:boolean merge():915:927 -> c
-    18:27:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1357:1366 -> c
-    18:27:boolean merge():929 -> c
-    28:35:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1365:1372 -> c
-    28:35:boolean merge():929 -> c
+    116:116:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1334 -> a
+    117:122:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1335:1340 -> a
+    123:127:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1349:1353 -> a
+    128:128:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1384:1384 -> a
+    129:157:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1394:1422 -> a
+    158:182:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1401:1425 -> a
+    1:2:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1126:1127 -> b
+    3:3:java.util.List getSynthesizedBridges():1140:1140 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1176:1176 -> b
+    1:2:boolean merge():913:914 -> c
+    3:4:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1311:1312 -> c
+    3:4:boolean merge():914 -> c
+    5:17:boolean merge():916:928 -> c
+    18:27:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1358:1367 -> c
+    18:27:boolean merge():930 -> c
+    28:35:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1366:1373 -> c
+    28:35:boolean merge():930 -> c
     36:36:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    36:36:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1372 -> c
-    36:36:boolean merge():929 -> c
-    37:41:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1373:1377 -> c
-    37:41:boolean merge():929 -> c
-    42:42:boolean merge():930:930 -> c
-    43:43:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1305:1305 -> c
-    43:43:boolean merge():930 -> c
-    44:44:boolean merge():931:931 -> c
-    45:45:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1228:1228 -> c
-    45:45:boolean merge():931 -> c
-    46:46:boolean merge():937:937 -> c
-    47:51:boolean merge():934:938 -> c
-    52:52:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1305:1305 -> c
-    52:52:boolean merge():938 -> c
-    53:53:boolean merge():939:939 -> c
+    36:36:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1373 -> c
+    36:36:boolean merge():930 -> c
+    37:41:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1374:1378 -> c
+    37:41:boolean merge():930 -> c
+    42:42:boolean merge():931:931 -> c
+    43:43:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1306:1306 -> c
+    43:43:boolean merge():931 -> c
+    44:44:boolean merge():932:932 -> c
+    45:45:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1229:1229 -> c
+    45:45:boolean merge():932 -> c
+    46:46:boolean merge():938:938 -> c
+    47:51:boolean merge():935:939 -> c
+    52:52:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1306:1306 -> c
+    52:52:boolean merge():939 -> c
+    53:53:boolean merge():940:940 -> c
     54:54:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    54:54:boolean merge():939 -> c
-    55:57:boolean merge():940:940 -> c
-    59:59:boolean merge():942:942 -> c
-    60:60:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1228:1228 -> c
-    60:60:boolean merge():942 -> c
-    61:61:boolean merge():946:946 -> c
-    62:82:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1276:1296 -> c
-    62:82:boolean merge():947 -> c
-    83:83:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1291:1291 -> c
-    83:83:boolean merge():947 -> c
-    84:86:boolean merge():949:951 -> c
+    54:54:boolean merge():940 -> c
+    55:57:boolean merge():941:941 -> c
+    59:59:boolean merge():943:943 -> c
+    60:60:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1229:1229 -> c
+    60:60:boolean merge():943 -> c
+    61:61:boolean merge():947:947 -> c
+    62:82:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1277:1297 -> c
+    62:82:boolean merge():948 -> c
+    83:83:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1292:1292 -> c
+    83:83:boolean merge():948 -> c
+    84:86:boolean merge():950:952 -> c
     87:87:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    87:87:boolean merge():951 -> c
-    88:97:boolean merge():955:964 -> c
-    98:117:boolean merge():963:982 -> c
-    118:121:boolean merge():981:984 -> c
+    87:87:boolean merge():952 -> c
+    88:97:boolean merge():956:965 -> c
+    98:117:boolean merge():964:983 -> c
+    118:121:boolean merge():982:985 -> c
     122:122:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    122:122:boolean merge():983 -> c
-    123:125:boolean merge():985:985 -> c
-    127:127:boolean merge():987:987 -> c
-    128:128:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1305:1305 -> c
-    128:128:boolean merge():987 -> c
-    129:145:boolean merge():993:1009 -> c
-    146:146:boolean merge():1002:1002 -> c
-    147:151:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1449:1453 -> c
-    147:151:boolean merge():1010 -> c
-    152:162:boolean merge():1013:1023 -> c
-    163:163:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1305:1305 -> c
-    163:163:boolean merge():1023 -> c
-    164:164:boolean merge():1028:1028 -> c
-    165:167:boolean merge():1027:1029 -> c
-    168:168:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1228:1228 -> c
-    168:168:boolean merge():1029 -> c
-    169:200:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1233:1264 -> c
-    169:200:boolean merge():1037 -> c
+    122:122:boolean merge():984 -> c
+    123:125:boolean merge():986:986 -> c
+    127:127:boolean merge():988:988 -> c
+    128:128:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1306:1306 -> c
+    128:128:boolean merge():988 -> c
+    129:145:boolean merge():994:1010 -> c
+    146:146:boolean merge():1003:1003 -> c
+    147:151:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1450:1454 -> c
+    147:151:boolean merge():1011 -> c
+    152:162:boolean merge():1014:1024 -> c
+    163:163:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1306:1306 -> c
+    163:163:boolean merge():1024 -> c
+    164:164:boolean merge():1029:1029 -> c
+    165:167:boolean merge():1028:1030 -> c
+    168:168:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1229:1229 -> c
+    168:168:boolean merge():1030 -> c
+    169:200:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1234:1265 -> c
+    169:200:boolean merge():1038 -> c
     201:201:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> c
-    201:201:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1264 -> c
-    201:201:boolean merge():1037 -> c
-    202:206:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1265:1269 -> c
-    202:206:boolean merge():1037 -> c
-    207:209:boolean merge():1038:1038 -> c
-    211:211:boolean merge():1040:1040 -> c
-    212:212:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1305:1305 -> c
-    212:212:boolean merge():1040 -> c
-    213:213:boolean merge():1043:1043 -> c
+    201:201:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1265 -> c
+    201:201:boolean merge():1038 -> c
+    202:206:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1266:1270 -> c
+    202:206:boolean merge():1038 -> c
+    207:209:boolean merge():1039:1039 -> c
+    211:211:boolean merge():1041:1041 -> c
+    212:212:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1306:1306 -> c
+    212:212:boolean merge():1041 -> c
+    213:213:boolean merge():1044:1044 -> c
     214:214:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    214:214:boolean merge():1043 -> c
-    215:217:boolean merge():1044:1044 -> c
-    221:223:boolean merge():1048:1050 -> c
-    224:249:boolean merge():1049:1074 -> c
-    250:259:boolean merge():1072:1081 -> c
-    260:267:boolean merge():1079:1086 -> c
-    268:270:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1316:1318 -> c
-    268:270:boolean merge():1086 -> c
-    271:295:boolean merge():1089:1113 -> c
-    296:296:boolean lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1130:1130 -> c
-    297:297:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1199:1199 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.a2:
+    214:214:boolean merge():1044 -> c
+    215:217:boolean merge():1045:1045 -> c
+    221:223:boolean merge():1049:1051 -> c
+    224:249:boolean merge():1050:1075 -> c
+    250:259:boolean merge():1073:1082 -> c
+    260:267:boolean merge():1080:1087 -> c
+    268:270:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1317:1319 -> c
+    268:270:boolean merge():1087 -> c
+    271:295:boolean merge():1090:1114 -> c
+    296:296:boolean lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1131:1131 -> c
+    297:297:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1200:1200 -> c
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.g2:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -79282,123 +79611,123 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1544:1544 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1544:1544 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1555:1555 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1549:1561 -> <init>
-    1:18:void fillSeenPositions():1591:1608 -> a
-    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1598:1599 -> 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):1618:1649 -> a
-    1:22:boolean mayCollide():1565:1586 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.EG:
+    1:1:void <clinit>():1545:1545 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1545:1545 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1556:1556 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1550:1562 -> <init>
+    1:18:void fillSeenPositions():1592:1609 -> a
+    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1599:1600 -> 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):1619:1650 -> a
+    1:22:boolean mayCollide():1566:1587 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.aH:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexClass source -> f
     boolean foundIllegalAccess -> c
     com.android.tools.r8.graph.ProgramMethod context -> d
-    1:1:void <clinit>():1791:1791 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1800:1802 -> <init>
-    1:1:boolean foundIllegalAccess():1806:1806 -> a
-    2:2:void setContext(com.android.tools.r8.graph.ProgramMethod):1810:1810 -> a
-    3:17:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1830:1844 -> a
+    1:1:void <clinit>():1792:1792 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1802:1804 -> <init>
+    1:1:boolean foundIllegalAccess():1808:1808 -> a
+    2:2:void setContext(com.android.tools.r8.graph.ProgramMethod):1812:1812 -> a
+    3:17:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1832:1846 -> a
     18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
-    18:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1844 -> a
-    19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1845:1845 -> a
-    20:23:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1879:1882 -> a
-    24:24:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1916:1916 -> a
-    1:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1895:1898 -> b
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):1866:1866 -> c
-    2:5:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1887:1890 -> c
-    6:6:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1911:1911 -> c
-    1:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1903:1906 -> d
-    5:5:void registerInstanceOf(com.android.tools.r8.graph.DexType):1941:1941 -> d
-    1:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1871:1874 -> e
-    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):1921:1921 -> e
-    6:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):1926:1926 -> e
-    1:1:void registerTypeReference(com.android.tools.r8.graph.DexType):1936:1936 -> f
-    1:7:void checkTypeReference(com.android.tools.r8.graph.DexType):1852:1858 -> g
-    8:8:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1931:1931 -> g
-    1:10:void checkFieldReference(com.android.tools.r8.graph.DexField):1814:1823 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.shaking.b2:
+    18:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1846 -> a
+    19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1847:1847 -> a
+    20:23:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1881:1884 -> a
+    24:24:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1918:1918 -> a
+    1:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1897:1900 -> b
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):1868:1868 -> c
+    2:5:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1889:1892 -> c
+    6:6:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1913:1913 -> c
+    1:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1905:1908 -> d
+    5:5:void registerInstanceOf(com.android.tools.r8.graph.DexType):1943:1943 -> d
+    1:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1873:1876 -> e
+    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):1923:1923 -> e
+    6:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):1928:1928 -> e
+    1:1:void registerTypeReference(com.android.tools.r8.graph.DexType):1938:1938 -> f
+    1:7:void checkTypeReference(com.android.tools.r8.graph.DexType):1854:1860 -> g
+    8:8:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1933:1933 -> g
+    1:10:void checkFieldReference(com.android.tools.r8.graph.DexField):1816:1825 -> i
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.shaking.h2:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap cache -> a
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):553:553 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):548:556 -> <init>
-    1:35:java.util.Collection get():561:595 -> a
-    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):579:579 -> a
-    37:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):603:617 -> a
-    52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):623:630 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.c2:
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):554:554 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):549:557 -> <init>
+    1:35:java.util.Collection get():562:596 -> a
+    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):580:580 -> a
+    37:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):604:618 -> a
+    52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):624:631 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.i2:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
     com.android.tools.r8.shaking.VerticalClassMerger$Rename NEVER -> c
-    1:3:void <clinit>():190:192 -> <clinit>
-    4:4:void <clinit>():189:189 -> <clinit>
-    1:1:void <init>(java.lang.String,int):189:189 -> <init>
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.shaking.d2:
+    1:3:void <clinit>():191:193 -> <clinit>
+    4:4:void <clinit>():190:190 -> <clinit>
+    1:1:void <init>(java.lang.String,int):190:190 -> <init>
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.shaking.j2:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> h
     com.android.tools.r8.graph.DexProgramClass target -> g
     com.android.tools.r8.graph.DexType source -> f
-    1:1:void <clinit>():1681:1681 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1686:1689 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1694:1694 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1704:1704 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1709:1709 -> a
-    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1719:1719 -> a
-    5:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1736:1756 -> a
-    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1763:1763 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1699:1699 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1714:1714 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1780:1780 -> b
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1774:1774 -> c
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1769:1769 -> d
+    1:1:void <clinit>():1682:1682 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1687:1690 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1695:1695 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1705:1705 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1710:1710 -> a
+    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1720:1720 -> a
+    5:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1737:1757 -> a
+    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1764:1764 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1700:1700 -> b
+    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1715:1715 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1781:1781 -> b
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1775:1775 -> c
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1770:1770 -> d
     boolean isContextFreeForMethods() -> e
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1724:1724 -> e
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1729:1729 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.shaking.e2:
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1725:1725 -> e
+    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1730:1730 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.shaking.k2:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> d
     com.android.tools.r8.graph.DexMethod method -> c
-    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1958:1963 -> <init>
-    1:1:java.util.function.Consumer getRegistryCallback():1998:1998 -> P
-    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1984:1985 -> Q
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1960:1965 -> <init>
+    1:1:java.util.function.Consumer getRegistryCallback():2000:2000 -> P
+    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1986:1987 -> Q
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):24:24 -> Q
-    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1985 -> Q
-    4:11:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1986:1993 -> Q
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1945:1945 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):1978:1979 -> a
-    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1999:2009 -> a
-    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2001:2001 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.shaking.f2:
+    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1987 -> Q
+    4:11:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1988:1995 -> Q
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1947:1947 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):1980:1981 -> a
+    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2001:2011 -> a
+    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2003:2003 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.shaking.l2:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder lensBuilder -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.classmerging.VerticallyMergedClasses mergedClasses -> h
     java.util.List synthesizedBridges -> i
-    1:1:void <clinit>():1465:1465 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,java.util.List):1477:1482 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1465:1465 -> a
-    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1513:1513 -> a
-    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1518:1518 -> a
+    1:1:void <clinit>():1466:1466 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,java.util.List):1478:1483 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1466:1466 -> a
+    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1514:1514 -> a
+    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1519:1519 -> a
     4:4:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):299:299 -> a
-    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1518 -> a
-    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1519:1519 -> a
+    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1519 -> a
+    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1520:1520 -> a
     6:6:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
-    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1519 -> a
-    7:8:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1525:1526 -> a
+    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1520 -> a
+    7:8:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1526:1527 -> a
     9:9:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> a
-    9:9:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1526 -> a
-    10:10:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1526:1526 -> a
-    11:16:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1533:1538 -> a
-    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1487:1497 -> b
-    12:13:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1504:1505 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.shaking.k2:
+    9:9:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1527 -> a
+    10:10:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1527:1527 -> a
+    11:16:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1534:1539 -> a
+    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1488:1498 -> b
+    12:13:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1505:1506 -> b
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.shaking.q2:
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map originalMethodSignaturesForBridges -> r
     java.util.Map contextualVirtualToDirectMethodMaps -> p
@@ -79422,8 +79751,8 @@
     1:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):89:90 -> g
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):94 -> g
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.shaking.h2:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.shaking.i2:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.shaking.n2:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.shaking.o2:
     java.util.Map methodMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> f
     boolean $assertionsDisabled -> i
@@ -79466,9 +79795,9 @@
     106:119:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder):336:349 -> a
     1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):308:308 -> b
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):321:321 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.shaking.j2:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.shaking.p2:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult get(com.android.tools.r8.graph.RewrittenPrototypeDescription) -> a
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.MG:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.iH:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -79505,7 +79834,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.MG$a:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.iH$a:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -79515,19 +79844,19 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.MG$b:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.iH$b:
     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.n2:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.t2:
     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 -> B
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.shaking.l2:
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.m2:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.shaking.r2:
+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>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
@@ -79544,96 +79873,105 @@
     1:1:com.android.tools.r8.synthesis.SyntheticItems toSyntheticItems():46:46 -> d
 com.android.tools.r8.synthesis.CommittedSyntheticsCollection -> com.android.tools.r8.synthesis.b:
     com.android.tools.r8.com.google.common.collect.ImmutableMap nonLegacyClasses -> c
-    boolean $assertionsDisabled -> e
+    boolean $assertionsDisabled -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMap nonLegacyMethods -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap legacyTypes -> a
-    com.android.tools.r8.synthesis.CommittedSyntheticsCollection EMPTY -> d
-    1:83:void <clinit>():24:106 -> <clinit>
-    1:8: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.ImmutableMap):124:131 -> <init>
-    9:12: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.ImmutableMap):129:132 -> <init>
-    13:13: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.ImmutableMap):128:128 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):24:24 -> a
-    2:2:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():136:136 -> a
-    3:3:boolean containsLegacyType(com.android.tools.r8.graph.DexType):152:152 -> a
-    4:5:void forEachNonLegacyItem(java.util.function.Consumer):180:181 -> a
-    6:6:void lambda$forEachNonLegacyItem$0(java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodReference):180:180 -> a
-    7:7:void lambda$forEachNonLegacyItem$1(java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticProgramClassReference):181:181 -> a
-    8:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):185:186 -> a
-    10:10:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():136:136 -> a
-    10:10:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):189 -> a
-    11:11:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):189:189 -> a
-    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder builder():140:140 -> a
-    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):189 -> a
-    13:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):190:199 -> a
+    com.android.tools.r8.synthesis.CommittedSyntheticsCollection EMPTY -> e
+    com.android.tools.r8.com.google.common.collect.ImmutableSet syntheticInputs -> d
+    1:98:void <clinit>():25:122 -> <clinit>
+    1:9: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.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet):144:152 -> <init>
+    10:13: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.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet):150:153 -> <init>
+    14:14: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.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet):149:149 -> <init>
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):25:25 -> a
+    2:2:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():157:157 -> a
+    3:3:boolean containsLegacyType(com.android.tools.r8.graph.DexType):180:180 -> a
+    4:5:void forEachNonLegacyItem(java.util.function.Consumer):216:217 -> a
+    6:6:void lambda$forEachNonLegacyItem$0(java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodReference):216:216 -> a
+    7:7:void lambda$forEachNonLegacyItem$1(java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticProgramClassReference):217:217 -> a
+    8:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):221:222 -> a
+    10:10:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():157:157 -> a
+    10:10:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):225 -> a
+    11:11:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):225:225 -> a
+    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder builder():161:161 -> a
+    12:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):225 -> a
+    13:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):226:235 -> a
     23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    23:23:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):200 -> a
-    24:24:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):200:200 -> a
+    23:23:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):236 -> a
+    24:24:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):236:236 -> a
     25:25:void com.android.tools.r8.utils.BooleanBox.set():39:39 -> a
-    25:25:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):201 -> a
-    26:29:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):203:206 -> a
+    25:25:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):237 -> a
+    26:29:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):239:242 -> a
     30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    30:30:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):207 -> a
-    31:31:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):207:207 -> a
+    30:30:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):243 -> a
+    31:31:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):243:243 -> a
     32:32:void com.android.tools.r8.utils.BooleanBox.set():39:39 -> a
-    32:32:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):208 -> a
-    33:36:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):210:213 -> a
-    37:37:void lambda$pruneItems$2(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticReference):193:193 -> a
+    32:32:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):244 -> a
+    33:36:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):246:249 -> a
+    37:37:void lambda$pruneItems$2(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticReference):229:229 -> a
     38:38:void com.android.tools.r8.utils.BooleanBox.set():39:39 -> a
-    38:38:void lambda$pruneItems$2(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticReference):194 -> a
-    39:39:void lambda$pruneItems$2(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticReference):196:196 -> a
-    40:43:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):217:220 -> a
-    44:51:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):225:232 -> a
-    52:54:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):236:238 -> a
-    55:56:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):243:244 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$100(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):24:24 -> b
-    2:2:boolean containsNonLegacyType(com.android.tools.r8.graph.DexType):156:156 -> b
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap getLegacyTypes():160:160 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$200(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):24:24 -> c
-    2:2:boolean containsLegacyType(com.android.tools.r8.graph.DexType):152:152 -> c
-    2:2:boolean containsType(com.android.tools.r8.graph.DexType):148 -> c
-    3:3:boolean containsType(com.android.tools.r8.graph.DexType):148:148 -> c
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyClasses():168:168 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyMethods():164:164 -> d
-    2:6:com.android.tools.r8.synthesis.SyntheticReference getNonLegacyItem(com.android.tools.r8.graph.DexType):172:176 -> d
-    1:1:boolean isEmpty():144:144 -> e
+    38:38:void lambda$pruneItems$2(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticReference):230 -> a
+    39:39:void lambda$pruneItems$2(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticReference):232:232 -> a
+    40:43:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):253:256 -> a
+    44:48:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteItems(java.util.Set,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):261:265 -> a
+    44:48:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):257 -> a
+    49:49:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):257:257 -> a
+    50:57:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):270:277 -> a
+    58:60:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):281:283 -> a
+    61:62:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):288:289 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$100(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):25:25 -> b
+    2:2:boolean containsNonLegacyType(com.android.tools.r8.graph.DexType):184:184 -> b
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap getLegacyTypes():192:192 -> b
+    4:4:void forEachSyntheticInput(java.util.function.Consumer):212:212 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$200(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):25:25 -> c
+    2:2:boolean containsSyntheticInput(com.android.tools.r8.graph.DexType):188:188 -> c
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyClasses():200:200 -> c
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet access$300(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):25:25 -> d
+    2:2:boolean containsLegacyType(com.android.tools.r8.graph.DexType):180:180 -> d
+    2:2:boolean containsType(com.android.tools.r8.graph.DexType):176 -> d
+    3:3:boolean containsType(com.android.tools.r8.graph.DexType):176:176 -> d
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyMethods():196:196 -> d
+    1:3:boolean isEmpty():169:171 -> e
+    4:8:com.android.tools.r8.synthesis.SyntheticReference getNonLegacyItem(com.android.tools.r8.graph.DexType):204:208 -> e
 com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder -> com.android.tools.r8.synthesis.b$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder newLegacyClasses -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder newNonLegacyMethods -> c
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder newNonLegacyClasses -> b
     com.android.tools.r8.synthesis.CommittedSyntheticsCollection parent -> a
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):33:33 -> <init>
-    2:8:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):28:34 -> <init>
-    1:2:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addItem(com.android.tools.r8.synthesis.SyntheticDefinition):38:39 -> a
+    com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder newSyntheticInputs -> e
+    1:1:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):35:35 -> <init>
+    2:9:void <init>(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):29:36 -> <init>
+    1:2:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addItem(com.android.tools.r8.synthesis.SyntheticDefinition):40:41 -> a
     3:3:com.android.tools.r8.synthesis.SyntheticProgramClassReference com.android.tools.r8.synthesis.SyntheticProgramClassDefinition.toReference():46:46 -> a
-    3:3:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):45 -> a
-    4:7:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):49:52 -> a
-    4:7:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):45 -> a
+    3:3:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):47 -> a
+    4:7:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):51:54 -> a
+    4:7:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):47 -> a
     8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    8:8:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):52 -> a
-    8:8:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):45 -> a
-    9:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):52:52 -> a
-    9:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):45 -> a
-    10:13:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):49:52 -> a
+    8:8:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):54 -> a
+    8:8:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):47 -> a
+    9:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):54:54 -> a
+    9:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassDefinition):47 -> a
+    10:13:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):51:54 -> a
     14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    14:14:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):52 -> a
-    15:15:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):52:52 -> a
-    16:16:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):57:57 -> a
-    17:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):61:64 -> a
-    17:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):57 -> a
+    14:14:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):54 -> a
+    15:15:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyClass(com.android.tools.r8.synthesis.SyntheticProgramClassReference):54:54 -> a
+    16:16:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):59:59 -> a
+    17:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):63:66 -> a
+    17:20:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):59 -> a
     21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    21:21:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):64 -> a
-    21:21:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):57 -> a
-    22:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):64:64 -> a
-    22:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):57 -> a
-    23:26:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):61:64 -> a
+    21:21:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):66 -> a
+    21:21:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):59 -> a
+    22:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):66:66 -> a
+    22:22:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):59 -> a
+    23:26:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):63:66 -> a
     27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    27:27:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):64 -> a
-    28:28:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):64:64 -> a
-    29:32:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addLegacyClasses(java.util.Map):69:72 -> a
-    33:33:void lambda$addLegacyClasses$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticDefinition):72:72 -> a
-    34:37:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addLegacyClass(com.android.tools.r8.synthesis.LegacySyntheticReference):77:80 -> a
-    38:53:com.android.tools.r8.synthesis.CommittedSyntheticsCollection build():85:100 -> a
-com.android.tools.r8.synthesis.LegacySyntheticDefinition -> com.android.tools.r8.internal.zo:
+    27:27:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):66 -> a
+    28:28:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodReference):66:66 -> a
+    29:32:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addLegacyClasses(java.util.Map):71:74 -> a
+    33:33:void lambda$addLegacyClasses$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.LegacySyntheticDefinition):74:74 -> a
+    34:37:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addLegacyClass(com.android.tools.r8.synthesis.LegacySyntheticReference):79:82 -> a
+    38:38:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder addToSyntheticInputs():87:87 -> a
+    1:24:com.android.tools.r8.synthesis.CommittedSyntheticsCollection build():92:115 -> b
+com.android.tools.r8.synthesis.LegacySyntheticDefinition -> com.android.tools.r8.internal.Wo:
     java.util.Map contexts -> b
     com.android.tools.r8.graph.DexProgramClass clazz -> a
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):18:18 -> <init>
@@ -79642,7 +79980,7 @@
     3:3:java.util.Set getContexts():28:28 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getDefinition():36:36 -> b
     1:1:com.android.tools.r8.synthesis.LegacySyntheticReference toReference():32:32 -> c
-com.android.tools.r8.synthesis.LegacySyntheticReference -> com.android.tools.r8.internal.Ao:
+com.android.tools.r8.synthesis.LegacySyntheticReference -> com.android.tools.r8.internal.Xo:
     com.android.tools.r8.graph.DexType type -> a
     java.util.Set contexts -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.util.Set):14:16 -> <init>
@@ -79655,7 +79993,7 @@
     4:8:com.android.tools.r8.synthesis.LegacySyntheticReference com.android.tools.r8.synthesis.LegacySyntheticReference.rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):31:35 -> a
     4:8:com.android.tools.r8.synthesis.Rewritable rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):10 -> a
     1:1:java.util.Set getContexts():25:25 -> b
-com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.eB:
+com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.FB:
     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.c:
@@ -79666,7 +80004,7 @@
     1:1:void <clinit>():28:28 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):67:70 -> <init>
     1:2:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.DexClass):43:44 -> a
-    3:3:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
+    3:3:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
     3:3:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.DexClass):44 -> a
     4:4:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.DexClass):44:44 -> a
     5:5:com.android.tools.r8.synthesis.SynthesizingContext fromType(com.android.tools.r8.graph.DexType):48:48 -> a
@@ -79676,7 +80014,7 @@
     19:19:com.android.tools.r8.origin.Origin getInputContextOrigin():85:85 -> a
     20:25:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):89:94 -> a
     26:26:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):103:103 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():425:425 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():428:428 -> a
     27:27:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):103 -> a
     28:48:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):106:126 -> a
     49:49:boolean isDerivedFromMainDexList(com.android.tools.r8.shaking.MainDexInfo):136:136 -> a
@@ -79743,10 +80081,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.isPublic():665:665 -> j
+    2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> j
     2:2:boolean isValid():43 -> j
     3:3:boolean isValid():43:43 -> j
-    4:4:boolean com.android.tools.r8.graph.DexClass.isFinal():601:601 -> j
+    4:4:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> j
     4:4:boolean isValid():43 -> j
     5:5:boolean isValid():43:43 -> j
     1:1:com.android.tools.r8.synthesis.SyntheticClasspathClassReference toReference():38:38 -> k
@@ -79765,7 +80103,7 @@
     7:8:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):18 -> a
     9:12:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):39:42 -> a
     9:12: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.DE:
+com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.fF:
 com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.j:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     boolean $assertionsDisabled -> c
@@ -79821,301 +80159,317 @@
     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.EE:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.gF:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function) -> a
 com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.synthesis.n:
     com.android.tools.r8.utils.InternalOptions options -> a
     com.android.tools.r8.synthesis.SyntheticItems synthetics -> b
     com.android.tools.r8.synthesis.CommittedSyntheticsCollection committed -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):158:161 -> <init>
-    1:15:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):205:219 -> a
-    16:19:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):218:221 -> a
-    20:20:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):220:220 -> a
-    21:56:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):216:251 -> a
-    57:57:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():30:30 -> a
-    57:57:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):252 -> a
-    58:59:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):252:253 -> a
-    60:60:void lambda$computeFinalSynthetics$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):223:223 -> a
-    61:61:void lambda$computeFinalSynthetics$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):224:224 -> a
-    62:64:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.synthesis.SyntheticReference):234:236 -> a
-    65:76:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):262:273 -> a
-    77:84:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):269:276 -> a
-    85:85:boolean verifyNoNestedSynthetics():291:291 -> a
-    86:86:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):293:293 -> a
-    87:87:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):286:286 -> a
-    87:87:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):293 -> a
-    88:88:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):294:294 -> a
-    89:89:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.allowSyntheticContext():72:72 -> a
-    89:89:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):294 -> a
-    90:90:void lambda$verifyNoNestedSynthetics$3(com.android.tools.r8.synthesis.SyntheticReference):293:293 -> a
-    91:209:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):307:425 -> a
-    210:222:void lambda$buildLensAndProgram$4(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):338:350 -> a
-    223:229:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):395:401 -> a
-    230:230:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):397:397 -> a
-    231:234:boolean verifyNonRepresentativesRemovedFromApplication(com.android.tools.r8.graph.DexApplication,java.util.Map):434:437 -> a
-    235:235:boolean verifyNonRepresentativesRemovedFromApplication(com.android.tools.r8.graph.DexApplication,java.util.Map):436:436 -> a
-    236:236:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):448:448 -> a
-    237:237:boolean shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):459:459 -> a
-    237:237:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):448 -> a
-    238:238:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):450:450 -> a
-    239:239:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449:449 -> a
-    240:243:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):25:28 -> a
-    240:243:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> a
-    244:244:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):27:27 -> a
-    244:244:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> a
-    245:251:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createAnnotationSynthesizedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):363:369 -> a
-    245:251:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):27 -> a
-    245:251:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> a
-    252:265:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):164:177 -> a
-    252:265:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):26 -> a
-    252:265:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> a
-    266:266:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
-    266:266:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):449 -> a
-    267:288:java.util.Map computeActualEquivalences(java.util.Collection,java.util.Map,com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):470:491 -> a
-    289:289:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):475:475 -> a
-    290:296:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):532:538 -> a
-    290:296:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):474 -> a
-    297:297:boolean com.android.tools.r8.synthesis.SyntheticDefinition.isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):103:103 -> a
-    297:297:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):537 -> a
-    297:297:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):474 -> a
-    298:305:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):540:547 -> a
-    298:305:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):474 -> a
-    306:306:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):476:476 -> a
-    307:310:com.android.tools.r8.synthesis.SyntheticDefinition findDeterministicRepresentative(java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):572:575 -> a
-    307:310:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):478 -> a
-    311:315:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):481:485 -> a
-    316:318:void lambda$computeActualEquivalences$9(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):484:486 -> a
-    319:319:java.util.List lambda$computeActualEquivalences$8(java.lang.String):485:485 -> a
-    320:329:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):495:504 -> a
-    330:340:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):501:511 -> a
-    341:343:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):138:140 -> a
-    341:343:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):559 -> a
-    341:343:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):508 -> a
-    344:344:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):139:139 -> a
-    344:344:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):559 -> a
-    344:344:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):508 -> a
-    345:345:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):560:560 -> a
-    345:345:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):508 -> a
-    346:348:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):138:140 -> a
-    346:348:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):562 -> a
-    346:348:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):508 -> a
-    349:349:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):139:139 -> a
-    349:349:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):562 -> a
-    349:349:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):508 -> a
-    350:350:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):561:561 -> a
-    350:350:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):508 -> a
-    351:356:void lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):514:519 -> a
-    357:357:int lambda$computeActualEquivalences$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):498:498 -> a
-    358:360:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):138:140 -> a
-    358:360:int lambda$computeActualEquivalences$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):497 -> a
-    361:361:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):139:139 -> a
-    361:361:int lambda$computeActualEquivalences$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):497 -> a
-    362:372:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):587:597 -> a
-    373:376:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):596:599 -> a
-    377:377:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):286:286 -> a
-    377:377:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):599 -> a
-    378:378:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):600:600 -> a
-    379:405:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):616:642 -> a
-    406:407:void lambda$computePotentialEquivalences$13(java.util.Set,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):631:632 -> a
-    408:408:com.android.tools.r8.graph.DexType lambda$computePotentialEquivalences$14(java.util.Set,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):635:635 -> a
-    409:409:java.util.List lambda$computePotentialEquivalences$15(com.android.tools.r8.com.google.common.hash.HashCode):640:640 -> a
-    410:423:java.util.Map lookupDefinitions(com.android.tools.r8.graph.AppView,java.util.Collection):647:660 -> a
-    1:10:void finalize(com.android.tools.r8.graph.AppView):165:174 -> b
-    11:11:void finalize(com.android.tools.r8.graph.AppView):173:173 -> b
-    12:19:void finalize(com.android.tools.r8.graph.AppView):170:177 -> b
-    20:24:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):357:361 -> b
+    1:1:void <clinit>():51:51 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):159:162 -> <init>
+    1:15:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):206:220 -> a
+    16:19:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):219:222 -> a
+    20:20:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):221:221 -> a
+    21:64:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):217:260 -> a
+    65:65:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():30:30 -> a
+    65:65:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):262 -> a
+    66:67:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):262:263 -> a
+    68:68:void lambda$computeFinalSynthetics$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):224:224 -> a
+    69:69:void lambda$computeFinalSynthetics$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):225:225 -> a
+    70:72:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.synthesis.SyntheticReference):235:237 -> a
+    73:73:void lambda$computeFinalSynthetics$3(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):245:245 -> a
+    74:85:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):272:283 -> a
+    86:93:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):279:286 -> a
+    94:94:boolean verifyNoNestedSynthetics():301:301 -> a
+    95:95:void lambda$verifyNoNestedSynthetics$4(com.android.tools.r8.synthesis.SyntheticReference):303:303 -> a
+    96:96:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):296:296 -> a
+    96:96:void lambda$verifyNoNestedSynthetics$4(com.android.tools.r8.synthesis.SyntheticReference):303 -> a
+    97:97:void lambda$verifyNoNestedSynthetics$4(com.android.tools.r8.synthesis.SyntheticReference):304:304 -> a
+    98:98:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.allowSyntheticContext():72:72 -> a
+    98:98:void lambda$verifyNoNestedSynthetics$4(com.android.tools.r8.synthesis.SyntheticReference):304 -> a
+    99:99:void lambda$verifyNoNestedSynthetics$4(com.android.tools.r8.synthesis.SyntheticReference):303:303 -> a
+    100:218:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):317:435 -> a
+    219:231:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):348:360 -> a
+    232:238:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):405:411 -> a
+    239:239:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):407:407 -> a
+    240:243:boolean verifyNonRepresentativesRemovedFromApplication(com.android.tools.r8.graph.DexApplication,java.util.Map):444:447 -> a
+    244:244:boolean verifyNonRepresentativesRemovedFromApplication(com.android.tools.r8.graph.DexApplication,java.util.Map):446:446 -> a
+    245:245:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):458:458 -> a
+    246:246:boolean shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):469:469 -> a
+    246:246:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):458 -> a
+    247:247:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):460:460 -> a
+    248:248:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):459:459 -> a
+    249:252:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):25:28 -> a
+    249:252:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):459 -> a
+    253:253:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):27:27 -> a
+    253:253:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):459 -> a
+    254:260:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createAnnotationSynthesizedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):363:369 -> a
+    254:260:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):27 -> a
+    254:260:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):459 -> a
+    261:274:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):164:177 -> a
+    261:274:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):26 -> a
+    261:274:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):459 -> a
+    275:275:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
+    275:275:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):459 -> a
+    276:297:java.util.Map computeActualEquivalences(java.util.Collection,java.util.Map,com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):480:501 -> a
+    298:298:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):485:485 -> a
+    299:305:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):542:548 -> a
+    299:305:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):484 -> a
+    306:306:boolean com.android.tools.r8.synthesis.SyntheticDefinition.isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):103:103 -> a
+    306:306:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):547 -> a
+    306:306:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):484 -> a
+    307:314:java.util.List groupEquivalent(java.util.List,boolean,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):550:557 -> a
+    307:314:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):484 -> a
+    315:315:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):486:486 -> a
+    316:319:com.android.tools.r8.synthesis.SyntheticDefinition findDeterministicRepresentative(java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):582:585 -> a
+    316:319:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):488 -> a
+    320:324:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):491:495 -> a
+    325:327:void lambda$computeActualEquivalences$10(boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.List):494:496 -> a
+    328:328:java.util.List lambda$computeActualEquivalences$9(java.lang.String):495:495 -> a
+    329:338:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):505:514 -> a
+    339:349:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):511:521 -> a
+    350:352:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):139:141 -> a
+    350:352:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):569 -> a
+    350:352:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):518 -> a
+    353:353:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):140:140 -> a
+    353:353:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):569 -> a
+    353:353:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):518 -> a
+    354:354:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):570:570 -> a
+    354:354:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):518 -> a
+    355:357:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):139:141 -> a
+    355:357:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):572 -> a
+    355:357:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):518 -> a
+    358:358:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):140:140 -> a
+    358:358:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):572 -> a
+    358:358:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):518 -> a
+    359:359:boolean checkGroupsAreDistinct(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):571:571 -> a
+    359:359:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):518 -> a
+    360:365:void lambda$computeActualEquivalences$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.lang.String,java.util.List):524:529 -> a
+    366:366:int lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):508:508 -> a
+    367:369:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):139:141 -> a
+    367:369:int lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):507 -> a
+    370:370:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareToIncludingContext(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):140:140 -> a
+    370:370:int lambda$computeActualEquivalences$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):507 -> a
+    371:381:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):597:607 -> a
+    382:385:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):606:609 -> a
+    386:386:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):296:296 -> a
+    386:386:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):609 -> a
+    387:387:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView):610:610 -> a
+    388:414:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):626:652 -> a
+    415:416:void lambda$computePotentialEquivalences$14(java.util.Set,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):641:642 -> a
+    417:417:com.android.tools.r8.graph.DexType lambda$computePotentialEquivalences$15(java.util.Set,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):645:645 -> a
+    418:418:java.util.List lambda$computePotentialEquivalences$16(com.android.tools.r8.com.google.common.hash.HashCode):650:650 -> a
+    419:432:java.util.Map lookupDefinitions(com.android.tools.r8.graph.AppView,java.util.Collection):657:670 -> a
+    1:10:void finalize(com.android.tools.r8.graph.AppView):166:175 -> b
+    11:11:void finalize(com.android.tools.r8.graph.AppView):174:174 -> b
+    12:19:void finalize(com.android.tools.r8.graph.AppView):171:178 -> b
+    20:24:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):367:371 -> b
     25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> b
-    25:25:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):361 -> b
-    26:26:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):361:361 -> b
-    27:29:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):360:362 -> b
+    25:25:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):371 -> b
+    26:26:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):371:371 -> b
+    27:29:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):370:372 -> b
     30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> b
-    30:30:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):363 -> b
-    31:38:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):363:370 -> b
-    39:42:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):406:409 -> b
+    30:30:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):373 -> b
+    31:38:void lambda$buildLensAndProgram$6(com.android.tools.r8.graph.AppView,java.util.Set,java.util.List,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):373:380 -> b
+    39:42:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):416:419 -> b
     43:43:boolean com.android.tools.r8.graph.MethodCollection.hasDirectMethods():56:56 -> b
-    43:43:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):409 -> b
-    44:52:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):409:417 -> b
-    53:53:void lambda$buildLensAndProgram$7(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):412:412 -> b
-    54:54:com.android.tools.r8.ir.code.NumberGenerator lambda$createExternalType$12(java.lang.String):592:592 -> b
-    1:11:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView):181:191 -> c
-    12:12:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView):190:190 -> c
-    13:19:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView):187:193 -> c
-    1:5:void finalizeWithLiveness(com.android.tools.r8.graph.AppView):197:201 -> d
+    43:43:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):419 -> b
+    44:52:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):419:427 -> b
+    53:53:void lambda$buildLensAndProgram$8(com.android.tools.r8.graph.DexApplication,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):422:422 -> b
+    54:54:com.android.tools.r8.ir.code.NumberGenerator lambda$createExternalType$13(java.lang.String):602:602 -> b
+    1:11:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView):182:192 -> c
+    12:12:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView):191:191 -> c
+    13:19:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView):188:194 -> c
+    1:5:void finalizeWithLiveness(com.android.tools.r8.graph.AppView):198:202 -> d
 com.android.tools.r8.synthesis.SyntheticFinalization$1 -> com.android.tools.r8.synthesis.k:
     com.android.tools.r8.synthesis.SyntheticFinalization$Builder val$lensBuilder -> f
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):313:313 -> <init>
-    1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):321:321 -> a
-    2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):326:326 -> a
-    3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):331:331 -> a
-    1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):316:316 -> b
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):323:323 -> <init>
+    1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):331:331 -> a
+    2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):336:336 -> a
+    3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341:341 -> a
+    1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):326:326 -> b
 com.android.tools.r8.synthesis.SyntheticFinalization$Builder -> com.android.tools.r8.synthesis.l:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
     java.util.Map typeMap -> c
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap fieldMap -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:7:void <init>():86:92 -> <init>
-    8:8:void <init>(com.android.tools.r8.synthesis.SyntheticFinalization$1):86:86 -> <init>
-    1:1:java.util.Map access$200(com.android.tools.r8.synthesis.SyntheticFinalization$Builder):86:86 -> a
-    2:3:void move(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):95:96 -> a
-    4:5:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):100:101 -> a
-    6:6:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):105:105 -> a
-    7:10:com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens build(com.android.tools.r8.graph.AppView):109:112 -> a
+    1:1:void <clinit>():87:87 -> <clinit>
+    1:7:void <init>():87:93 -> <init>
+    8:8:void <init>(com.android.tools.r8.synthesis.SyntheticFinalization$1):87:87 -> <init>
+    1:1:java.util.Map access$200(com.android.tools.r8.synthesis.SyntheticFinalization$Builder):87:87 -> a
+    2:3:void move(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):96:97 -> a
+    4:5:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):101:102 -> a
+    6:6:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):106:106 -> a
+    7:10:com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens build(com.android.tools.r8.graph.AppView):110:113 -> a
 com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.android.tools.r8.synthesis.m:
     java.util.List members -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():116:116 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.synthesis.SyntheticDefinition,java.util.List):119:122 -> <init>
-    1:1:java.util.List access$300(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):116:116 -> a
-    2:2:java.util.List getMembers():130:130 -> a
-    1:1:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():126:126 -> b
-    1:4:java.lang.String toString():145:148 -> toString
+    1:1:void <clinit>():117:117 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.synthesis.SyntheticDefinition,java.util.List):120:123 -> <init>
+    1:1:java.util.List access$300(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):117:117 -> a
+    2:2:java.util.List getMembers():131:131 -> a
+    1:1:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():127:127 -> b
+    1:4:java.lang.String toString():146:149 -> toString
 com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.synthesis.n$a:
     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
     com.android.tools.r8.graph.PrunedItems prunedItems -> c
-    1:5:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.MainDexInfo):62:66 -> <init>
+    1:5:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.MainDexInfo):63:67 -> <init>
 com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens -> com.android.tools.r8.synthesis.o:
-    1:1: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.synthesis.SyntheticFinalization$1):70:70 -> <init>
-    2: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):77:77 -> <init>
+    1:1: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.synthesis.SyntheticFinalization$1):71:71 -> <init>
+    2: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):78:78 -> <init>
 com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.synthesis.p:
     com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics pending -> c
     int nextSyntheticId -> a
     com.android.tools.r8.synthesis.CommittedSyntheticsCollection committed -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):103:103 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):106:106 -> <init>
-    3:23:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):88:108 -> <init>
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):104:104 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):107:107 -> <init>
+    3:23:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):89:109 -> <init>
     1:1:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):34:34 -> a
-    1:1:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):462 -> a
-    2:2:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):466:466 -> a
-    2:2:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):462 -> a
-    3:3:com.android.tools.r8.synthesis.SyntheticItems empty():92:92 -> a
-    4:12:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):113:121 -> a
-    13:13:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():140:140 -> a
-    13:13:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):121 -> a
-    14:26:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):123:135 -> a
-    27:38:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):134:145 -> a
-    39:41:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):130:130 -> a
-    42:51:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):154:163 -> a
-    52:52:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    52:52:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):163 -> a
-    53:63:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):163:173 -> a
-    64:80:java.util.Collection getSynthesizingContexts(com.android.tools.r8.graph.DexType):250:266 -> a
-    81:82:java.util.Set getSynthesizingContexts(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):272:273 -> a
-    83:93:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):287:297 -> a
-    94:104:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition):307:317 -> a
-    105:105:void addLegacySyntheticClassForLibraryDesugaring(com.android.tools.r8.graph.DexProgramClass):323:323 -> a
-    106:107:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):330:331 -> a
-    108:108:com.android.tools.r8.synthesis.LegacySyntheticDefinition lambda$internalAddLegacySyntheticClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):339:339 -> a
-    109:112:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):351:354 -> a
-    113:119:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):353:359 -> a
-    120:120:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    120:120:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):359 -> a
-    121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    121:121:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456 -> a
-    121:121:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):359 -> a
-    122:122:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    122:122:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):359 -> a
-    123:127:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):367:371 -> a
-    128:128:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    128:128:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):371 -> a
-    129:129:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    129:129:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456 -> a
-    129:129:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):371 -> a
-    130:130:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    130:130:com.android.tools.r8.graph.DexClasspathClass createClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):371 -> a
-    131:137:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):383:389 -> a
-    138:138:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    138:138:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):389 -> a
-    139:145:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):400:406 -> a
-    146:146:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    146:146:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):406 -> a
-    147:147:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    147:147:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456 -> a
-    147:147:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):406 -> a
-    148:148:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    148:148:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):406 -> a
-    149:154:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):414:419 -> a
-    155:155:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    155:155:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):419 -> a
-    156:156:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    156:156:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456 -> a
-    156:156:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):419 -> a
-    157:157:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    157:157:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):419 -> a
-    158:171:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):438:451 -> a
-    172:172:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):456:456 -> a
-    172:172:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):451 -> a
-    173:173:void lambda$createMethod$2(com.android.tools.r8.synthesis.SyntheticMethodBuilder):448:448 -> a
-    174:174:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):466:466 -> a
-    175:175:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):471:471 -> a
-    176:176:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):34:34 -> a
-    176:176:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):473 -> a
-    177:177:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):473:473 -> a
-    178:178:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):472:472 -> a
-    179:181:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):481:483 -> a
-    182:182:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():140:140 -> a
-    182:182:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):483 -> a
-    183:183:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):485:485 -> a
-    184:186:boolean verifyClassesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):525:527 -> a
-    184:186:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):485 -> a
-    187:203:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):486:502 -> a
-    204:209:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):501:506 -> a
-    210:210:boolean com.android.tools.r8.graph.DexApplication$Builder.isDirect():0:0 -> a
-    210:210:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):506 -> a
-    211:212:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):507:508 -> a
-    213:213:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    213:213:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16 -> a
-    213:213:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):508 -> a
-    214:214:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16:16 -> a
-    214:214:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):508 -> a
-    215:226:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):508:519 -> a
-    1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):97:98 -> b
-    3:3:boolean isLegacyCommittedSynthetic(com.android.tools.r8.graph.DexType):198:198 -> b
-    3:3:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexType):210 -> b
-    4:4:boolean isLegacyPendingSynthetic(com.android.tools.r8.graph.DexType):206:206 -> b
-    4:4:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexType):210 -> b
-    5:5:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getNonLegacySyntheticKind(com.android.tools.r8.graph.DexProgramClass):226:226 -> b
-    6:6:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):218:218 -> b
-    6:6:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getNonLegacySyntheticKind(com.android.tools.r8.graph.DexProgramClass):226 -> b
-    7:18:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getNonLegacySyntheticKind(com.android.tools.r8.graph.DexProgramClass):226:237 -> b
-    19:19:java.util.Collection getLegacyPendingClasses():303:303 -> b
-    20:20:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):429:429 -> b
-    21:23:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):535:537 -> b
-    1:1:java.util.Collection getPendingSyntheticClasses():190:190 -> c
-    2:2:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):194:194 -> c
-    2:2:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):222 -> c
-    3:3:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):202:202 -> c
-    3:3:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):222 -> c
-    4:4:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):335:335 -> c
-    5:5:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):194:194 -> c
-    5:5:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):335 -> c
-    6:10:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):335:339 -> c
-    11:13:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):338:340 -> c
-    1:1:boolean hasPendingSyntheticClasses():186:186 -> d
-    2:2:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):202:202 -> d
-    3:3:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):246:246 -> d
-    4:4:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):242:242 -> d
-    4:4:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):246 -> d
+    1:1:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):536 -> a
+    2:2:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):540:540 -> a
+    2:2:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):536 -> a
+    3:3:com.android.tools.r8.synthesis.SyntheticItems empty():93:93 -> a
+    4:13:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):114:123 -> a
+    14:14:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builderForSyntheticInputs():165:165 -> a
+    14:14:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):123 -> a
+    15:26:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):125:136 -> a
+    27:45:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):135:153 -> a
+    46:48:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):132:132 -> a
+    49:58:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):163:172 -> a
+    59:59:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    59:59:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):172 -> a
+    60:70:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):172:182 -> a
+    71:87:java.util.Collection getSynthesizingContexts(com.android.tools.r8.graph.DexType):264:280 -> a
+    88:89:java.util.Set getSynthesizingContexts(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):286:287 -> a
+    90:100:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):301:311 -> a
+    101:111:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition):321:331 -> a
+    112:112:void addLegacySyntheticClassForLibraryDesugaring(com.android.tools.r8.graph.DexProgramClass):337:337 -> a
+    113:114:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):344:345 -> a
+    115:115:com.android.tools.r8.synthesis.LegacySyntheticDefinition lambda$internalAddLegacySyntheticClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):353:353 -> a
+    116:119:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):365:368 -> a
+    120:126:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):367:373 -> a
+    127:127:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    127:127:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):373 -> a
+    128:128:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    128:128:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530 -> a
+    128:128:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):373 -> a
+    129:129:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    129:129:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):373 -> a
+    130:136:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):385:391 -> a
+    137:137:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    137:137:com.android.tools.r8.graph.DexProgramClass createFixedClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):391 -> a
+    138:143:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):426:431 -> a
+    144:144:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    144:144:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):431 -> a
+    145:145:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    145:145:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530 -> a
+    145:145:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):431 -> a
+    146:146:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    146:146:com.android.tools.r8.graph.DexClasspathClass createFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexItemFactory):431 -> a
+    147:150:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):440:443 -> a
+    147:150:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    151:151:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    151:151:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):443 -> a
+    151:151:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    152:161:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):443:452 -> a
+    152:161:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    162:162:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    162:162:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):452 -> a
+    162:162:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    163:163:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    163:163:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530 -> a
+    163:163:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):452 -> a
+    163:163:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    164:164:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    164:164:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):452 -> a
+    164:164:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    165:165:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):453:453 -> a
+    165:165:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    166:174:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):469:477 -> a
+    175:175:com.android.tools.r8.graph.DexClasspathClass ensureFixedClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):454:454 -> a
+    175:175:void ensureDirectMethodOnSyntheticClasspathClassWhileMigrating(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):468 -> a
+    176:182:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):487:493 -> a
+    183:183:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    183:183:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):493 -> a
+    184:184:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    184:184:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530 -> a
+    184:184:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):493 -> a
+    185:185:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    185:185:com.android.tools.r8.graph.DexProgramClass createFixedClassFromType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):493 -> a
+    186:199:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):512:525 -> a
+    200:200:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):530:530 -> a
+    200:200:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):525 -> a
+    201:201:void lambda$createMethod$2(com.android.tools.r8.synthesis.SyntheticMethodBuilder):522:522 -> a
+    202:202:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):540:540 -> a
+    203:203:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):545:545 -> a
+    204:204:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):34:34 -> a
+    204:204:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):547 -> a
+    205:205:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):547:547 -> a
+    206:206:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):546:546 -> a
+    207:209:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):555:557 -> a
+    210:210:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():161:161 -> a
+    210:210:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):557 -> a
+    211:211:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):559:559 -> a
+    212:214:boolean verifyClassesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):599:601 -> a
+    212:214:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):559 -> a
+    215:231:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):560:576 -> a
+    232:237:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):575:580 -> a
+    238:238:boolean com.android.tools.r8.graph.DexApplication$Builder.isDirect():0:0 -> a
+    238:238:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):580 -> a
+    239:240:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):581:582 -> a
+    241:241:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    241:241:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16 -> a
+    241:241:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):582 -> a
+    242:242:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16:16 -> a
+    242:242:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):582 -> a
+    243:254:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):582:593 -> a
+    1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):98:99 -> b
+    3:3:boolean isLegacyCommittedSynthetic(com.android.tools.r8.graph.DexType):207:207 -> b
+    3:3:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexType):219 -> b
+    4:4:boolean isLegacyPendingSynthetic(com.android.tools.r8.graph.DexType):215:215 -> b
+    4:4:boolean isLegacySyntheticClass(com.android.tools.r8.graph.DexType):219 -> b
+    5:5:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getNonLegacySyntheticKind(com.android.tools.r8.graph.DexProgramClass):235:235 -> b
+    6:6:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):227:227 -> b
+    6:6:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getNonLegacySyntheticKind(com.android.tools.r8.graph.DexProgramClass):235 -> b
+    7:18:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getNonLegacySyntheticKind(com.android.tools.r8.graph.DexProgramClass):235:246 -> b
+    19:19:java.util.Collection getLegacyPendingClasses():317:317 -> b
+    20:20:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):503:503 -> b
+    21:23:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):609:611 -> b
+    1:1:java.util.Collection getPendingSyntheticClasses():199:199 -> c
+    2:2:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):203:203 -> c
+    2:2:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):231 -> c
+    3:3:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):211:211 -> c
+    3:3:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):231 -> c
+    4:4:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):349:349 -> c
+    5:5:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):203:203 -> c
+    5:5:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):349 -> c
+    6:10:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):349:353 -> c
+    11:13:com.android.tools.r8.synthesis.LegacySyntheticDefinition internalAddLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):352:354 -> c
+    1:1:boolean hasPendingSyntheticClasses():195:195 -> d
+    2:2:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):211:211 -> d
+    3:4:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):251:252 -> d
+    1:1:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):260:260 -> e
+    2:2:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):256:256 -> e
+    2:2:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):260 -> e
 com.android.tools.r8.synthesis.SyntheticItems$1 -> com.android.tools.r8.synthesis.p$a:
 com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics -> com.android.tools.r8.synthesis.p$b:
     java.util.Map legacyClasses -> a
     java.util.concurrent.ConcurrentHashMap nonLegacyDefinitions -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:10:void <init>():45:54 -> <init>
-    11:11:void <init>(com.android.tools.r8.synthesis.SyntheticItems$1):45:45 -> <init>
-    1:1:java.util.Map access$100(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):45:45 -> a
-    2:2:boolean containsType(com.android.tools.r8.graph.DexType):62:62 -> a
-    3:4:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):66:67 -> a
-    5:15:java.util.Collection getAllProgramClasses():72:82 -> a
-    1:1:java.util.concurrent.ConcurrentHashMap access$200(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):45:45 -> b
-    2:2:boolean isEmpty():58:58 -> b
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:10:void <init>():46:55 -> <init>
+    11:11:void <init>(com.android.tools.r8.synthesis.SyntheticItems$1):46:46 -> <init>
+    1:1:java.util.Map access$100(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):46:46 -> a
+    2:2:boolean containsType(com.android.tools.r8.graph.DexType):63:63 -> a
+    3:4:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):67:68 -> a
+    5:15:java.util.Collection getAllProgramClasses():73:83 -> a
+    1:1:java.util.concurrent.ConcurrentHashMap access$200(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):46:46 -> b
+    2:2:boolean isEmpty():59:59 -> b
 com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.synthesis.p$c:
     java.util.Set getSynthesizingContexts(com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.synthesis.SyntheticMarker -> com.android.tools.r8.synthesis.q:
@@ -80135,43 +80489,45 @@
     1:1:boolean isSyntheticClass():86:86 -> c
     1:1:boolean isSyntheticMethods():82:82 -> d
 com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.synthesis.r:
-    com.android.tools.r8.graph.DexString name -> b
-    com.android.tools.r8.synthesis.SyntheticClassBuilder parent -> a
-    com.android.tools.r8.graph.DexProto proto -> c
-    com.android.tools.r8.cf.CfVersion classFileVersion -> d
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.MethodAccessFlags accessFlags -> f
-    com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator codeGenerator -> e
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder):30:30 -> <init>
-    2:9:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder):24:31 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):35:35 -> a
-    2:4:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(com.android.tools.r8.graph.DexString):39:41 -> a
-    2:4:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):35 -> a
-    5:5:com.android.tools.r8.synthesis.SyntheticMethodBuilder setProto(com.android.tools.r8.graph.DexProto):46:46 -> a
-    6:6:com.android.tools.r8.synthesis.SyntheticMethodBuilder setClassFileVersion(com.android.tools.r8.cf.CfVersion):51:51 -> a
-    7:7:com.android.tools.r8.synthesis.SyntheticMethodBuilder setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):56:56 -> a
-    8:8:com.android.tools.r8.synthesis.SyntheticMethodBuilder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):61:61 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedMethod build():66:66 -> a
-    10:10:com.android.tools.r8.graph.DexMethod getMethodSignature():98:98 -> a
-    10:10:com.android.tools.r8.graph.DexEncodedMethod build():68 -> a
-    11:11:com.android.tools.r8.graph.DexEncodedMethod build():69:69 -> a
-    12:12:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():102:102 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedMethod build():72 -> a
-    13:15:com.android.tools.r8.graph.DexEncodedMethod build():73:75 -> a
-    16:16:com.android.tools.r8.graph.Code getCodeObject(com.android.tools.r8.graph.DexMethod):106:106 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod build():76 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod build():76:76 -> a
+    com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator codeGenerator -> f
+    com.android.tools.r8.graph.DexString name -> c
+    com.android.tools.r8.graph.DexProto proto -> d
+    com.android.tools.r8.graph.DexType holderType -> b
+    com.android.tools.r8.cf.CfVersion classFileVersion -> e
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.graph.MethodAccessFlags accessFlags -> g
+    com.android.tools.r8.graph.DexItemFactory factory -> a
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder):33:33 -> <init>
+    2:10:void <init>(com.android.tools.r8.synthesis.SyntheticClassBuilder):27:35 -> <init>
+    11:11:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):38:38 -> <init>
+    12:25:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):27:40 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):44:44 -> a
+    2:4:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(com.android.tools.r8.graph.DexString):48:50 -> a
+    5:5:com.android.tools.r8.synthesis.SyntheticMethodBuilder setProto(com.android.tools.r8.graph.DexProto):55:55 -> a
+    6:6:com.android.tools.r8.synthesis.SyntheticMethodBuilder setClassFileVersion(com.android.tools.r8.cf.CfVersion):60:60 -> a
+    7:7:com.android.tools.r8.synthesis.SyntheticMethodBuilder setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):65:65 -> a
+    8:8:com.android.tools.r8.synthesis.SyntheticMethodBuilder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):70:70 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod build():75:75 -> a
+    10:10:com.android.tools.r8.graph.DexMethod getMethodSignature():107:107 -> a
+    10:10:com.android.tools.r8.graph.DexEncodedMethod build():77 -> a
+    11:11:com.android.tools.r8.graph.DexEncodedMethod build():78:78 -> a
+    12:12:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():111:111 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedMethod build():81 -> a
+    13:15:com.android.tools.r8.graph.DexEncodedMethod build():82:84 -> a
+    16:16:com.android.tools.r8.graph.Code getCodeObject(com.android.tools.r8.graph.DexMethod):115:115 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod build():85 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod build():85:85 -> a
     18:18:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):291:291 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod build():76 -> a
-    19:19:com.android.tools.r8.graph.DexEncodedMethod build():79:79 -> a
-    20:21:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):90:91 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedMethod build():85 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod build():88:88 -> a
+    20:21:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):99:100 -> a
     22:22:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
-    22:22:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):92 -> a
-    23:23:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):93:93 -> a
+    22:22:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):101 -> a
+    23:23:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> a
     24:24:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():885:885 -> a
-    24:24:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):94 -> a
-    25:25:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):94:94 -> a
+    24:24:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    25:25:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
 com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.synthesis.r$a:
     com.android.tools.r8.graph.Code generate(com.android.tools.r8.graph.DexMethod) -> a
 com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.synthesis.s:
@@ -80343,10 +80699,10 @@
     com.android.tools.r8.synthesis.SyntheticProgramDefinition asProgramDefinition() -> c
     boolean isProgramDefinition() -> i
     1:1:boolean isValid():51:51 -> j
-    2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():665:665 -> j
+    2:2:boolean com.android.tools.r8.graph.DexClass.isPublic():669:669 -> j
     2:2:boolean isValid():51 -> j
     3:4:boolean isValid():51:52 -> j
-    5:5:boolean com.android.tools.r8.graph.DexClass.isFinal():601:601 -> j
+    5:5:boolean com.android.tools.r8.graph.DexClass.isFinal():605:605 -> j
     5:5:boolean isValid():53 -> j
     6:6:boolean isValid():53:53 -> j
     1:1:com.android.tools.r8.synthesis.SyntheticProgramClassReference toReference():46:46 -> k
@@ -80360,7 +80716,7 @@
     1:6:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):19 -> a
     7:16:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):41:50 -> a
     7:16: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.HE:
+com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.jF:
     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.y:
@@ -80398,7 +80754,6 @@
     16:20:void printTypeHeader(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):22:26 -> a
     16:20:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):103 -> a
     21:21:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    21:21:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     21:21:void printTypeHeader(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):26 -> a
     21:21:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):103 -> a
     22:27:void printTypeHeader(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):27:32 -> a
@@ -80408,102 +80763,77 @@
     41:41:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):54:54 -> a
     41:41:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     42:42:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    42:42:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     42:42:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):57 -> a
     42:42:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     43:43:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):58:58 -> a
     43:43:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     44:44:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    44:44:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     44:44:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):59 -> a
     44:44:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     45:45:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):60:60 -> a
     45:45:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     46:46:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    46:46:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     46:46:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):61 -> a
     46:46:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     47:47:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):62:62 -> a
     47:47:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     48:48:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    48:48:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     48:48:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):63 -> a
     48:48:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     49:49:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):65:65 -> a
     49:49:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     50:50:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    50:50:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     50:50:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):66 -> a
     50:50:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     51:51:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68:68 -> a
     51:51:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     52:52:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):65:65 -> a
-    52:52:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):0 -> a
     52:52:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68 -> a
     52:52:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     53:53:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    53:53:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     53:53:void printConstructorName(com.android.tools.r8.references.MethodReference):38 -> a
     53:53:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):66 -> a
-    53:53:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):0 -> a
     53:53:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68 -> a
     53:53:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     54:54:void com.android.tools.r8.tracereferences.Formatter.printReturn(com.android.tools.r8.references.MethodReference):61:61 -> a
-    54:54:void com.android.tools.r8.tracereferences.Formatter.printReturn(com.android.tools.r8.references.MethodReference):0 -> a
     54:54:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):68 -> a
-    54:54:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):0 -> a
     54:54:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68 -> a
     54:54:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     55:55:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    55:55:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     55:55:void com.android.tools.r8.tracereferences.Formatter.printReturn(com.android.tools.r8.references.MethodReference):61 -> a
-    55:55:void com.android.tools.r8.tracereferences.Formatter.printReturn(com.android.tools.r8.references.MethodReference):0 -> a
     55:55:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):68 -> a
-    55:55:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):0 -> a
     55:55:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68 -> a
     55:55:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     56:56:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    56:56:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     56:56:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):69 -> a
-    56:56:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):0 -> a
     56:56:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68 -> a
     56:56:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     57:57:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):70:70 -> a
-    57:57:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):0 -> a
     57:57:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68 -> a
     57:57:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
     58:58:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    58:58:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
     58:58:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):70 -> a
-    58:58:void com.android.tools.r8.tracereferences.Formatter.printNameAndReturn(com.android.tools.r8.references.MethodReference):0 -> a
     58:58:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):68 -> a
     58:58:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
-    59:59:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):69:69 -> a
-    59:59:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
-    60:60:void com.android.tools.r8.tracereferences.Formatter.printArguments(com.android.tools.r8.references.MethodReference):0:0 -> a
-    60:60:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):69 -> a
-    60:60:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
-    61:61:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):70:70 -> a
-    61:61:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
-    62:65:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):117:120 -> a
-    66:72:void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):43:49 -> a
-    66:72:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):123 -> a
-    73:73:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    73:73:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
-    73:73:void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):43 -> a
-    73:73:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):123 -> a
-    74:74:void printTypeFooter():82:82 -> a
-    74:74:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):125 -> a
-    75:78:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):128:131 -> a
-    79:80:void printPackageNames(java.util.List):75:76 -> a
-    79:80:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):132 -> a
-    81:81:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
-    81:81:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):0 -> a
-    81:81:void printPackageNames(java.util.List):76 -> a
-    81:81:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):132 -> a
-    82:82:java.lang.String com.android.tools.r8.tracereferences.Formatter.lambda$print$0(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):94:94 -> a
-    83:83:java.lang.String com.android.tools.r8.tracereferences.Formatter.lambda$print$1(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):113:113 -> a
-    84:84:java.lang.String com.android.tools.r8.tracereferences.Formatter.lambda$print$2(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):118:118 -> a
+    59:60:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):69:70 -> a
+    59:60:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):115 -> a
+    61:64:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):117:120 -> a
+    65:71:void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):43:49 -> a
+    65:71:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):123 -> a
+    72:72:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
+    72:72:void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):43 -> a
+    72:72:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):123 -> a
+    73:73:void printTypeFooter():82:82 -> a
+    73:73:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):125 -> a
+    74:77:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):128:131 -> a
+    78:79:void printPackageNames(java.util.List):75:76 -> a
+    78:79:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):132 -> a
+    80:80:void com.android.tools.r8.tracereferences.Formatter.append(java.lang.String):37:37 -> a
+    80:80:void printPackageNames(java.util.List):76 -> a
+    80:80:void com.android.tools.r8.tracereferences.Formatter.print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):132 -> a
+    81:81:java.lang.String com.android.tools.r8.tracereferences.Formatter.lambda$print$0(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):94:94 -> a
+    82:82:java.lang.String com.android.tools.r8.tracereferences.Formatter.lambda$print$1(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):113:113 -> a
+    83:83:java.lang.String com.android.tools.r8.tracereferences.Formatter.lambda$print$2(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):118:118 -> a
 com.android.tools.r8.tracereferences.MissingDefinitionsDiagnostic -> com.android.tools.r8.tracereferences.MissingDefinitionsDiagnostic:
     java.util.Set missingMethods -> c
     java.util.Set missingClasses -> a
@@ -81063,65 +81393,59 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.utils.AndroidApp):85:85 -> a
     2:6:java.util.Map dumpFeatureSplitFileNames(com.android.tools.r8.features.FeatureSplitConfiguration):101:105 -> a
     2:6:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):587 -> a
-    7:24:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):588:605 -> a
-    25:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
-    25:25:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):605 -> a
-    26:32:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):606:612 -> a
-    33:67:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):609:643 -> a
-    68:77:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):640:649 -> a
-    78:109:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):604:635 -> a
-    110:156:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):603:649 -> a
-    157:160:void printClassFileProviders(java.lang.StringBuilder,java.util.Collection):165:168 -> a
-    161:167:void printProgramResource(java.lang.StringBuilder,com.android.tools.r8.ProgramResource):174:180 -> a
-    168:169:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):210:211 -> a
-    170:170:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):212:212 -> a
-    171:171:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):228:228 -> a
-    172:172:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):240:240 -> a
-    173:175:int applicationSize():245:245 -> a
-    177:185:int applicationSize():247:247 -> a
-    192:192:int applicationSize():254:254 -> a
-    193:193:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):254:254 -> a
-    194:198:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):340:344 -> a
-    199:202:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):412:415 -> a
-    203:204:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):460:461 -> a
-    205:209:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):469:473 -> a
-    210:213:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):472:475 -> a
-    214:220:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):474:480 -> a
-    221:242:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):477:498 -> a
-    243:252:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):495:504 -> a
-    253:253:java.util.List getMainDexListResources():384:384 -> a
-    253:253:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):506 -> a
-    254:255:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):506:507 -> a
-    256:256:java.util.List getMainDexClasses():391:391 -> a
-    256:256:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):510 -> a
-    257:267:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):510:520 -> a
-    268:277:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):517:526 -> a
-    278:278:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):524:524 -> a
-    279:280:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):547:548 -> a
-    279:280:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):531 -> a
-    281:282:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):540:541 -> a
-    281:282:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):532 -> a
-    283:283:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):533:533 -> a
-    284:347:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):471:534 -> a
-    348:352:java.util.zip.ZipOutputStream lambda$dumpProgramResources$2(com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):622:626 -> a
-    353:366:void closeOutputStreams(java.util.Collection):657:670 -> a
-    367:367:void closeOutputStreams(java.util.Collection):667:667 -> a
-    368:370:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):680:682 -> a
-    371:371:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
-    371:371:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):682 -> a
-    372:388:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):683:699 -> a
-    389:405:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):681:697 -> a
-    406:425:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):680:699 -> a
-    426:432:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):710:716 -> a
-    433:434:java.lang.String extractClassDescriptor(byte[]):755:756 -> a
-    433:434:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):715 -> a
-    435:435:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):394:394 -> a
-    435:435:java.lang.String extractClassDescriptor(byte[]):757 -> a
-    435:435:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):715 -> a
-    436:436:java.lang.String extractClassDescriptor(byte[]):762:762 -> a
-    436:436:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):715 -> a
-    437:442:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):717:722 -> a
-    443:448:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):721:726 -> a
+    7:31:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):588:612 -> a
+    32:66:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):609:643 -> a
+    67:76:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):640:649 -> a
+    77:108:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):604:635 -> a
+    109:155:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):603:649 -> a
+    156:159:void printClassFileProviders(java.lang.StringBuilder,java.util.Collection):165:168 -> a
+    160:166:void printProgramResource(java.lang.StringBuilder,com.android.tools.r8.ProgramResource):174:180 -> a
+    167:168:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):210:211 -> a
+    169:169:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):212:212 -> a
+    170:170:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):228:228 -> a
+    171:171:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):240:240 -> a
+    172:174:int applicationSize():245:245 -> a
+    176:184:int applicationSize():247:247 -> a
+    191:191:int applicationSize():254:254 -> a
+    192:192:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):254:254 -> a
+    193:197:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):340:344 -> a
+    198:201:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):412:415 -> a
+    202:203:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):460:461 -> a
+    204:208:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):469:473 -> a
+    209:212:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):472:475 -> a
+    213:219:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):474:480 -> a
+    220:241:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):477:498 -> a
+    242:251:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):495:504 -> a
+    252:252:java.util.List getMainDexListResources():384:384 -> a
+    252:252:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):506 -> a
+    253:254:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):506:507 -> a
+    255:255:java.util.List getMainDexClasses():391:391 -> a
+    255:255:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):510 -> a
+    256:266:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):510:520 -> a
+    267:276:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):517:526 -> a
+    277:277:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):524:524 -> a
+    278:279:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):547:548 -> a
+    278:279:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):531 -> a
+    280:281:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):540:541 -> a
+    280:281:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):532 -> a
+    282:282:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):533:533 -> a
+    283:346:void dump(java.nio.file.Path,com.android.tools.r8.DumpOptions,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory):471:534 -> a
+    347:351:java.util.zip.ZipOutputStream lambda$dumpProgramResources$2(com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):622:626 -> a
+    352:365:void closeOutputStreams(java.util.Collection):657:670 -> a
+    366:366:void closeOutputStreams(java.util.Collection):667:667 -> a
+    367:386:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):680:699 -> a
+    387:403:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):681:697 -> a
+    404:423:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):680:699 -> a
+    424:430:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):710:716 -> a
+    431:432:java.lang.String extractClassDescriptor(byte[]):755:756 -> a
+    431:432:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):715 -> a
+    433:433:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):394:394 -> a
+    433:433:java.lang.String extractClassDescriptor(byte[]):757 -> a
+    433:433:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):715 -> a
+    434:434:java.lang.String extractClassDescriptor(byte[]):762:762 -> a
+    434:434:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):715 -> a
+    435:440:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):717:722 -> a
+    441:446:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):721:726 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$300(com.android.tools.r8.utils.AndroidApp):85:85 -> b
     2:2:com.android.tools.r8.utils.Reporter defaultReporter():216:216 -> b
     2:2:com.android.tools.r8.utils.AndroidApp$Builder builder():223 -> b
@@ -81604,7 +81928,7 @@
     1:1:void <init>(java.lang.String,java.util.Map,com.android.tools.r8.utils.CfLineToMethodMapper$1):114:114 -> <init>
     2:4:void <init>(java.lang.String,java.util.Map):120:122 -> <init>
     1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):127:127 -> b
-com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.z5:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.y5:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -81630,14 +81954,14 @@
     7:7:com.android.tools.r8.utils.CfgPrinter sp():65:65 -> c
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.B5:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.A5:
     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.A5:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.z5:
     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.A6:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.B6:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -81660,8 +81984,8 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():240:240 -> d
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.y6:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.A6:
     boolean ready -> e
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> f
@@ -81680,7 +82004,7 @@
     66:66:void lambda$get$0(com.android.tools.r8.graph.DexClass):278 -> a
     67:67:void lambda$get$0(com.android.tools.r8.graph.DexClass):278:278 -> a
     1:1:java.lang.Object get():246:246 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.Y6:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.Z6:
     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
@@ -81692,8 +82016,8 @@
     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$1 -> com.android.tools.r8.internal.T6:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.V6:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -81705,14 +82029,14 @@
     7:7:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):107:107 -> a
     8:10:java.util.Collection collectTypes():114:116 -> a
     1:1:java.lang.String toString():123:123 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.V6:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.W6:
     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.W6:
+com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.X6:
     java.util.Set filteredOut -> c
     com.android.tools.r8.utils.ClassProvider provider -> b
     boolean $assertionsDisabled -> d
@@ -81722,14 +82046,14 @@
     3:6:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):175:178 -> a
     7:8: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.X6:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.Y6:
     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>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):137:138 -> a
     3:3:java.util.Collection collectTypes():144:144 -> a
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.b7:
+com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.c7:
     java.util.Comparator COMPARATOR -> a
     1:2:void <clinit>():14:15 -> <clinit>
     1:1:java.util.Comparator com.android.tools.r8.utils.ClassReferenceUtils.getClassReferenceComparator():34:34 -> a
@@ -81742,7 +82066,7 @@
     5:5:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):29 -> a
     6:6:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):29:29 -> a
     7:7:java.util.Comparator getClassReferenceComparator():34:34 -> a
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.x7:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.y7:
     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
@@ -81762,15 +82086,15 @@
     2:2:void com.android.tools.r8.utils.ClasspathClassCollection.<init>():15:15 -> e
     2:2:com.android.tools.r8.utils.ClasspathClassCollection empty():23 -> e
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.Y7:
+com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.Z7:
     1:4:java.util.Set mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.i8:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.j8:
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:java.util.Comparator listComparator(java.util.Comparator):17:17 -> a
     2:4:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):18:20 -> a
     5:5:java.util.Comparator unreachableComparator():67:67 -> a
     6:6:int lambda$unreachableComparator$2(java.lang.Object,java.lang.Object):68:68 -> a
-com.android.tools.r8.utils.CompareResult -> com.android.tools.r8.internal.j8:
+com.android.tools.r8.utils.CompareResult -> com.android.tools.r8.internal.k8:
     com.android.tools.r8.utils.CompareResult LESS_THAN -> b
     com.android.tools.r8.utils.CompareResult EQUAL -> c
     com.android.tools.r8.utils.CompareResult GREATER_THAN -> d
@@ -81782,7 +82106,7 @@
     3:5:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.fromComparisonResult(int):38:40 -> a
     3:5:com.android.tools.r8.utils.CompareResult compare(java.lang.Object,java.lang.Object,java.util.Comparator):33 -> a
     1:1:boolean isEqual():25:25 -> b
-com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.U8:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
 com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.utils.u:
     void lambda$emptyBiConsumer$4(java.lang.Object,java.lang.Object) -> a
@@ -81796,9 +82120,9 @@
     void lambda$emptyThrowingConsumer$5(java.lang.Object) -> b
     1:1:java.util.function.Consumer emptyConsumer():31:31 -> b
     1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():39:39 -> c
-com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.J9:
+com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.K9:
     1:2:java.util.Deque newArrayDeque(java.lang.Object):13:14 -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.K9:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.L9:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -81880,13 +82204,13 @@
     6:10:boolean isDescriptor(java.lang.String):245 -> x
     1:6:boolean isValidJavaType(java.lang.String):123:128 -> y
     1:2:java.lang.String javaTypeToDescriptor(java.lang.String):67:68 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.K9$a:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.L9$a:
     java.lang.String module -> a
     java.lang.String descriptor -> b
     1:3:void <init>(java.lang.String,java.lang.String):590:592 -> <init>
     1:1:java.lang.String getDescriptor():600:600 -> a
     1:1:java.lang.String getModule():596:596 -> b
-com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.Da:
+com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.Ea:
     1:2:java.lang.String getDefaultDexFileName(int):10:11 -> a
 com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.utils.v:
     byte[] dexVersionBytes -> b
@@ -81918,7 +82242,7 @@
 com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.utils.v$a:
     int[] $SwitchMap$com$android$tools$r8$utils$AndroidApiLevel -> a
     1:1:void <clinit>():40:40 -> <clinit>
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.Fa:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.Ga:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
@@ -81932,7 +82256,7 @@
     24:24:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):73:73 -> a
     25:25:java.nio.file.Path getPath():83:83 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():78:78 -> getOrigin
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Ha:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Ia:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -81948,28 +82272,28 @@
     1:1:java.util.Set lambda$collectSets$0(java.lang.Object):143:143 -> e
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> f
     1:12:java.lang.String toString():150:161 -> toString
-com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.Ta:
+com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.Ua:
     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.Qa:
+com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.Ra:
     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.Ra:
+com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.Sa:
     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.Sa:
+com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.Ta:
     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.ob:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.pb:
     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
@@ -82112,7 +82436,7 @@
 com.android.tools.r8.utils.FeatureClassMapping$SpecificationOrigin -> com.android.tools.r8.utils.FeatureClassMapping$e:
     1:1:void <init>(java.nio.file.Path):72:72 -> <init>
     1:1:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.Gc:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -82130,7 +82454,7 @@
     10:12:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Comparable,java.lang.Comparable):29 -> b
     10:12:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):27 -> b
     13:16:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):28:31 -> b
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Ic:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Jc:
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -82165,17 +82489,17 @@
     1:1:java.util.List readAllLines(java.nio.file.Path):90:90 -> g
 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.Vc:
+com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.Wc:
     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.Uc:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.Vc:
     java.nio.file.Path path -> e
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.id:
-com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.jd:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.jd:
+com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.kd:
     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.yd:
+com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.Td:
     1:2:void forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):28:29 -> a
     3:3:java.util.function.Function ignoreArgument(java.util.function.Supplier):34:34 -> a
     4:4:java.lang.Object lambda$ignoreArgument$2(java.util.function.Supplier,java.lang.Object):34:34 -> a
@@ -82189,29 +82513,29 @@
     6:8:void 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.Ce:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.Xe:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.Ce$a:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.Xe$a:
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     java.lang.Iterable order(java.lang.Iterable) -> a
     1:1:com.android.tools.r8.utils.IROrdering$IdentityIROrdering getInstance():30:30 -> a
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.Ce$b:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.Xe$b:
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>():53:53 -> <init>
     1:1:com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering getInstance():56:56 -> a
     2:3:java.util.List com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering.order(java.lang.Iterable):61:62 -> a
     2:3:java.lang.Iterable order(java.lang.Iterable):49 -> a
-com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.Ie:
+com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.df:
     1:1:boolean isDexIdentifierPart(int):14:14 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean isDexIdentifierStart(int):10 -> b
     1:2:boolean isRelaxedDexIdentifierPart(int):18:19 -> c
     boolean isSimpleNameChar(int) -> d
     boolean isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.Ch:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.Xh:
     boolean $assertionsDisabled -> b
     int value -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -82230,11 +82554,11 @@
     1:1:void setMax(int):61 -> e
     2:2:void com.android.tools.r8.utils.IntBox.set(int):57:57 -> e
     2:2:void setMax(int):62 -> e
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Rh:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.mi:
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.Sh:
+com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.ni:
     boolean test(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.oi:
     java.lang.Object apply(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.A:
     java.util.Set descriptors -> c
@@ -82259,381 +82583,384 @@
     25:25:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.xi:
-    boolean enableUninstantiatedTypeOptimization -> f0
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.Si:
+    boolean enableValuePropagation -> f0
+    boolean forceAnnotateSynthetics -> P
     boolean printMemory -> i
     java.lang.String dumpInputToFile -> j
+    boolean enableEnumSwitchMapRemoval -> b0
+    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> T0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    boolean enableStringSwitchConversion -> X
+    boolean enableSwitchRewriting -> X
     boolean enableFieldBitAccessAnalysis -> q
-    boolean enableInheritanceClassInDexDistributor -> Z0
-    java.util.Set reportedMissingForDesugaring -> r1
-    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> u1
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> h1
+    boolean minimalMainDex -> Z0
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> V0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> h1
+    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> u1
+    boolean debug -> R0
     boolean enableSideEffectAnalysis -> G
-    int inliningInstructionAllowance -> T
+    int inliningInstructionLimit -> T
+    boolean forceProguardCompatibility -> N0
     boolean printTimes -> h
-    boolean ignoreMissingClasses -> J0
-    boolean processCovariantReturnTypeAnnotations -> E0
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> C0
+    boolean enableMinification -> J0
+    boolean skipReadingDexCode -> f1
     boolean enableServiceLoaderRewriting -> I
+    boolean enableLoadStoreOptimization -> A0
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> O0
+    com.android.tools.r8.DumpOptions dumpOptions -> q0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> u0
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> S0
     boolean enableVerticalClassMerging -> r
-    boolean enableLoadStoreOptimization -> z0
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> b0
+    boolean enableStringSwitchConversion -> Y
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> z
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> B0
+    boolean hasMarker -> r0
     java.util.List outputInspections -> g
     boolean enableDeterminismAnalysis -> H
-    int inliningMonitorEnterValuesAllowance -> U
-    boolean ignoreMainDexMissingClasses -> n0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> W0
+    int inliningInstructionAllowance -> U
+    boolean invalidDebugInfoStrict -> n0
+    java.util.Map warningInvalidDebugInfo -> e1
+    boolean enablePcDebugInfoOutput -> j0
     boolean libraryInterfacesMayHaveStaticInitialization -> o
-    boolean enableUninstantiatedTypeOptimizationForInterfaces -> g0
+    boolean enableUninstantiatedTypeOptimization -> g0
     java.util.function.BiPredicate dexClassChecksumFilter -> N
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> c0
     boolean enableEnumUnboxing -> w
-    boolean $assertionsDisabled -> x1
+    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> W0
+    int SUPPORTED_DEX_VERSION -> x1
     boolean enableClassStaticizer -> E
-    int inliningControlFlowResolutionBlocksThreshold -> V
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> N0
-    boolean configurationDebugging -> O0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> i1
+    int inliningMonitorEnterValuesAllowance -> V
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> i1
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> n1
-    boolean relocatorCompilation -> l1
-    boolean reportMissingClassesInEnclosingMethodAttribute -> K0
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> m1
+    boolean ignoreMissingClasses -> K0
     boolean cfToCfDesugar -> O
-    boolean lookupLibraryBeforeProgram -> F0
-    java.util.Map warningInvalidDebugInfo -> d1
+    boolean processCovariantReturnTypeAnnotations -> F0
+    java.util.Map warningInvalidParameterAnnotations -> d1
     boolean enableFieldAssignmentTracker -> p
     java.lang.String dumpInputToDirectory -> k
-    boolean enableNestReduction -> B0
-    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> R0
-    boolean enableSwitchRewriting -> W
+    int threadCount -> k0
     boolean applyInliningToInlinee -> x
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> t0
-    java.util.List mainDexKeepRules -> X0
+    java.util.Set extensiveLoggingFilter -> t0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean intermediate -> w0
+    int minApiLevel -> w0
     boolean enableInitializedClassesAnalysis -> F
-    boolean enableCfByteCodePassThrough -> o0
-    boolean useSmaliSyntax -> k0
+    int inliningControlFlowResolutionBlocksThreshold -> W
+    boolean ignoreMainDexMissingClasses -> o0
     java.util.Set neverMergePrefixes -> n
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableNeverMergePrefixes -> m
-    boolean enableRedundantFieldLoadElimination -> d0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> d0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> X0
+    com.android.tools.r8.dex.Marker marker -> s0
     boolean enableTreeShakingOfLibraryMethodOverrides -> L
     boolean enableDevirtualization -> u
-    java.util.List logArgumentsFilter -> y0
-    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> V0
-    java.util.List methodsFilter -> u0
+    java.util.Set invalidLibraryClasses -> t1
+    boolean $assertionsDisabled -> y1
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean skipIR -> P0
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> f1
-    int SUPPORTED_DEX_VERSION -> w1
+    java.util.function.Consumer syntheticProguardRulesConsumer -> r1
+    boolean configurationDebugging -> P0
     int applyInliningToInlineeMaxDepth -> y
-    boolean reportMissingClassesInInnerClassAttributes -> L0
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> T0
-    com.android.tools.r8.StringConsumer configurationConsumer -> j1
-    boolean enableTreeShaking -> H0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> o1
+    boolean reportMissingClassesInEnclosingMethodAttribute -> L0
+    boolean relocatorCompilation -> m1
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> j1
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> l1
+    boolean enableMainDexListCheck -> H0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> o1
     boolean enableSimpleInliningConstraints -> C
-    int callGraphLikelySpuriousCallEdgeThreshold -> P
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> n1
+    com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> w1
     boolean encodeChecksums -> M
-    boolean enableMainDexListCheck -> G0
-    java.util.Map warningInvalidParameterAnnotations -> c1
-    java.util.Set extensiveLoggingFilter -> s0
+    boolean lookupLibraryBeforeProgram -> G0
+    java.util.Map missingEnclosingMembers -> c1
+    boolean enableNestReduction -> C0
     boolean enableInlining -> v
-    int threadCount -> j0
-    boolean readCompileTimeAnnotations -> x0
-    int minApiLevel -> v0
-    int minimumStringSwitchSize -> Y
-    boolean invalidDebugInfoFatal -> l0
-    boolean enableRedundantConstNumberOptimization -> h0
+    java.util.List mainDexKeepRules -> Y0
+    boolean intermediate -> x0
+    boolean enableCfByteCodePassThrough -> p0
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> b1
+    boolean useSmaliSyntax -> l0
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> h0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> E0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> q1
     boolean enableClassInlining -> D
-    int classInliningInstructionLimit -> Q
-    com.android.tools.r8.dex.Marker marker -> r0
-    boolean enableValuePropagation -> e0
+    int callGraphLikelySpuriousCallEdgeThreshold -> Q
+    boolean enableRedundantFieldLoadElimination -> e0
     boolean enableNameReflectionOptimization -> J
-    boolean enableEnumSwitchMapRemoval -> a0
-    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> S0
-    java.util.Set invalidLibraryClasses -> s1
-    boolean minimalMainDex -> Y0
+    boolean enableEnumValueOptimization -> a0
+    java.util.List logArgumentsFilter -> z0
+    java.util.Set reportedMissingForDesugaring -> s1
+    java.util.List methodsFilter -> v0
     boolean enableArgumentRemoval -> s
-    java.util.function.Consumer syntheticProguardRulesConsumer -> q1
-    boolean enableEnumValueOptimization -> Z
-    boolean debug -> Q0
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> U0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> g1
-    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> t1
-    boolean forceProguardCompatibility -> M0
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> k1
+    int minimumStringSwitchSize -> Z
+    boolean skipIR -> Q0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> g1
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> U0
+    boolean reportMissingClassesInInnerClassAttributes -> M0
+    com.android.tools.r8.StringConsumer configurationConsumer -> k1
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> p1
     boolean enableInliningOfInvokesWithNullableReceivers -> A
-    int classInliningInstructionAllowance -> R
-    boolean enableMinification -> I0
-    com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> v1
-    java.util.Map missingEnclosingMembers -> b1
-    boolean skipReadingDexCode -> e1
+    int classInliningInstructionLimit -> R
+    boolean enableTreeShaking -> I0
+    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> v1
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> D0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> D0
+    boolean enableInheritanceClassInDexDistributor -> a1
     boolean enableStringConcatenationOptimization -> K
     boolean passthroughDexCode -> l
-    com.android.tools.r8.DumpOptions dumpOptions -> p0
+    boolean readCompileTimeAnnotations -> y0
     boolean enableUnusedInterfaceRemoval -> t
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> a1
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> p1
-    boolean hasMarker -> q0
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> A0
-    boolean invalidDebugInfoStrict -> m0
+    boolean invalidDebugInfoFatal -> m0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> c0
     boolean disableInliningOfLibraryMethodOverrides -> B
-    int inliningInstructionLimit -> S
-    boolean enablePcDebugInfoOutput -> i0
-    1:29:void <clinit>():90:118 -> <clinit>
-    1:1:void <init>():148:148 -> <init>
-    2:811:void <init>():140:949 -> <init>
-    812:816:void <init>():149:153 -> <init>
-    817:817:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):157:157 -> <init>
-    818:1627:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):140:949 -> <init>
-    1628:1635:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):158:165 -> <init>
-    1636:1636:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):169:169 -> <init>
-    1637:2446:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):140:949 -> <init>
-    2447:2461:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):170:184 -> <init>
-    1:3:void disableAllOptimizations():198:200 -> A
-    1:6:void disableGlobalOptimizations():204:209 -> B
-    7:7:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1181:1181 -> B
-    7:7:void disableGlobalOptimizations():209 -> B
-    8:16:void disableGlobalOptimizations():210:218 -> B
-    1:1:void disableNameReflectionOptimization():1405:1405 -> C
-    1:1:boolean enableBackportedMethodRewriting():1492:1492 -> D
-    1:6:void enableProtoShrinking():189:194 -> E
-    1:5:boolean enableTryWithResourcesDesugaring():1496:1500 -> F
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1484:1484 -> F
-    6:6:boolean enableTryWithResourcesDesugaring():1500 -> F
-    7:7:boolean enableTryWithResourcesDesugaring():1502:1502 -> F
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():701:709 -> G
-    1:9:java.util.Set getExtensiveLoggingFilter():688:696 -> H
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():413:413 -> I
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():452:452 -> I
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():414 -> I
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():415:415 -> I
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():456:456 -> I
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():416 -> I
-    5:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():417:421 -> I
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():133:133 -> J
-    1:1:boolean hasConsumer():409:409 -> K
-    1:1:boolean hasMethodsFilter():1044:1044 -> L
-    1:1:boolean hasProguardConfiguration():129:129 -> M
-    1:1:boolean hasUsageInformationConsumer():762:762 -> N
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():668:668 -> O
-    1:1:boolean isClassMergingExtensionRequired():606:606 -> P
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1209:1209 -> P
-    2:2:boolean isClassMergingExtensionRequired():606 -> P
-    3:3:boolean isClassMergingExtensionRequired():606:606 -> P
-    1:1:boolean isDesugaredLibraryCompilation():425:425 -> Q
-    1:1:boolean isDesugaring():464:464 -> R
-    1:1:boolean isGeneratingClassFiles():460:460 -> S
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():452:452 -> T
-    1:1:boolean isGeneratingDex():448 -> T
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():456:456 -> T
-    2:2:boolean isGeneratingDex():448 -> T
-    1:6:boolean isInterfaceMethodDesugaringEnabled():1516:1521 -> U
-    1:1:boolean isKeepAttributesSignatureEnabled():598:598 -> V
-    1:3:boolean isMinifying():570:570 -> W
-    5:5:boolean isMinifying():572:572 -> W
-    1:1:boolean isRelease():560:560 -> X
-    1:2:boolean isRepackagingEnabled():587:588 -> Y
-    1:3:boolean isShrinking():564:564 -> Z
-    5:5:boolean isShrinking():566:566 -> Z
+    int classInliningInstructionAllowance -> S
+    boolean enableRedundantConstNumberOptimization -> i0
+    1:29:void <clinit>():92:120 -> <clinit>
+    1:1:void <init>():150:150 -> <init>
+    2:812:void <init>():142:952 -> <init>
+    813:817:void <init>():151:155 -> <init>
+    818:818:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):159:159 -> <init>
+    819:1629:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):142:952 -> <init>
+    1630:1637:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):160:167 -> <init>
+    1638:1638:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):171:171 -> <init>
+    1639:2449:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):142:952 -> <init>
+    2450:2464:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):172:186 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():127:127 -> A
+    1:3:void disableAllOptimizations():200:202 -> B
+    1:15:void disableGlobalOptimizations():206:220 -> C
+    1:1:void disableNameReflectionOptimization():1416:1416 -> D
+    1:1:boolean enableBackportedMethodRewriting():1503:1503 -> E
+    1:6:void enableProtoShrinking():191:196 -> F
+    1:5:boolean enableTryWithResourcesDesugaring():1507:1511 -> G
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1495:1495 -> G
+    6:6:boolean enableTryWithResourcesDesugaring():1511 -> G
+    7:7:boolean enableTryWithResourcesDesugaring():1513:1513 -> G
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():704:712 -> H
+    1:9:java.util.Set getExtensiveLoggingFilter():691:699 -> I
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():416:416 -> J
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():455:455 -> J
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():417 -> J
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():418:418 -> J
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():459:459 -> J
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():419 -> J
+    5:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():420:424 -> J
+    1:3:com.android.tools.r8.naming.MapVersion getMapFileVersion():1407:1409 -> K
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():135:135 -> L
+    1:1:boolean hasConsumer():412:412 -> M
+    1:1:boolean hasMethodsFilter():1047:1047 -> N
+    1:1:boolean hasProguardConfiguration():131:131 -> O
+    1:1:boolean hasUsageInformationConsumer():765:765 -> P
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():671:671 -> Q
+    1:1:boolean isClassMergingExtensionRequired():609:609 -> R
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1212:1212 -> R
+    2:2:boolean isClassMergingExtensionRequired():609 -> R
+    3:3:boolean isClassMergingExtensionRequired():609:609 -> R
+    1:1:boolean isDesugaredLibraryCompilation():428:428 -> S
+    1:1:boolean isDesugaring():467:467 -> T
+    1:1:boolean isGeneratingClassFiles():463:463 -> U
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():455:455 -> V
+    1:1:boolean isGeneratingDex():451 -> V
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():459:459 -> V
+    2:2:boolean isGeneratingDex():451 -> V
+    1:6:boolean isInterfaceMethodDesugaringEnabled():1526:1531 -> W
+    1:1:boolean isKeepAttributesSignatureEnabled():601:601 -> X
+    1:3:boolean isMinifying():573:573 -> Y
+    5:5:boolean isMinifying():575:575 -> Y
+    1:1:boolean isRelease():563:563 -> Z
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.Box access$100(com.android.tools.r8.utils.InternalOptions):90:90 -> a
-    2:3:void setMarker(com.android.tools.r8.dex.Marker):353:354 -> a
-    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):358:359 -> a
-    6:28:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):366:388 -> a
-    6:28:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):361 -> a
-    29:38:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):395:404 -> a
-    39:39:boolean assertionsEnabled():802:802 -> a
-    40:42:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):833:835 -> a
-    43:43:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    43:43:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):835 -> a
-    44:44:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):835:835 -> a
-    45:45:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):833:833 -> a
-    46:52: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):877:883 -> a
-    53:53: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):878:878 -> a
-    54:55:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):890:891 -> a
-    56:56:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    56:56:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):893 -> a
-    57:63:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):893:899 -> a
-    64:64:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):891:891 -> a
-    65:73:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):909:917 -> a
-    74:74:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):916:916 -> a
-    75:75:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):910:910 -> a
-    76:76:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):918:918 -> a
-    77:80:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):923:926 -> a
-    81:85:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):931:935 -> a
-    86:92:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):940:946 -> a
-    93:93:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):941:941 -> a
-    94:94:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):945:945 -> a
-    95:100:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1049:1054 -> a
-    101:101:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1409:1409 -> a
-    102:102:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1438:1438 -> a
-    103:104:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():1443:1444 -> a
-    103:104:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1439 -> a
-    105:105:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1439:1439 -> a
-    1:1:boolean isStringSwitchConversionEnabled():1529:1529 -> a0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():664:664 -> b
-    2:35:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):839:872 -> b
-    36:36:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):934:934 -> b
-    37:42:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1554:1559 -> b
-    1:2:boolean keepInnerClassStructure():616:617 -> b0
-    1:1:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):925:925 -> c
-    2:2:boolean canHaveArtCheckCastVerifierBug():1867:1867 -> c
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():676:676 -> c0
-    1:10:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):952:961 -> d
-    11:17:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):957:963 -> d
-    18:19:boolean canHaveArtInstanceOfVerifierBug():1822:1823 -> d
-    1:32:boolean printWarnings():969:1000 -> d0
-    33:72:boolean printWarnings():996:1035 -> d0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1899:1899 -> e
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():672:672 -> e0
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1891:1891 -> f
-    1:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1443:1444 -> f0
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1913:1913 -> g
-    1:1:boolean shouldBackportMethods():433:433 -> g0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1569:1569 -> h
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.enableExperimentalRecordDesugaring():507:507 -> h0
-    1:1:boolean shouldDesugarRecords():511 -> h0
-    2:2:boolean shouldDesugarRecords():514:514 -> h0
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1476:1476 -> h0
-    3:3:boolean shouldDesugarRecords():514 -> h0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1480:1480 -> i
-    1:1:boolean shouldKeepStackMapTable():437:437 -> i0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():429:429 -> i0
-    2:2:boolean shouldKeepStackMapTable():437 -> i0
-    3:4:boolean shouldKeepStackMapTable():437:438 -> i0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():429:429 -> i0
-    5:5:boolean shouldKeepStackMapTable():439 -> i0
-    6:6:boolean shouldKeepStackMapTable():440:440 -> i0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1550:1550 -> j
-    1:1:boolean shouldRerunEnqueuer():444:444 -> j0
-    1:1:boolean canUseConstantMethodHandle():1456:1456 -> k
-    1:18:void signalFinishedToConsumers():480:497 -> k0
-    1:1:boolean canUseConstantMethodType():1460:1460 -> l
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1468:1468 -> m
-    1:2:boolean canUseFilledNewArrayOfObjects():1581:1582 -> n
-    1:1:boolean canUseInputStackMaps():621:621 -> o
-    1:1:boolean canUseInvokeCustom():1464:1464 -> p
-    1:1:boolean canUseInvokePolymorphic():1452:1452 -> q
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1448:1448 -> r
-    1:1:boolean canUseJavaUtilObjects():1538:1538 -> s
-    1:2:boolean canUseMultidex():1533:1534 -> t
-    1:1:boolean canUseNotInstruction():1617:1617 -> u
-    1:1:boolean canUsePrivateInterfaceMethods():1506:1506 -> v
-    1:1:boolean canUseRequireNonNull():1542:1542 -> w
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1590:1591 -> x
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():680:680 -> y
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():125:125 -> z
-com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.xi$a:
+    1:1:com.android.tools.r8.utils.Box access$100(com.android.tools.r8.utils.InternalOptions):92:92 -> a
+    2:3:void setMarker(com.android.tools.r8.dex.Marker):356:357 -> a
+    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):361:362 -> a
+    6:28:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):369:391 -> a
+    6:28:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):364 -> a
+    29:38:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):398:407 -> a
+    39:39:boolean assertionsEnabled():805:805 -> a
+    40:42:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):836:838 -> a
+    43:43:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
+    43:43:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):838 -> a
+    44:44:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):838:838 -> a
+    45:45:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):836:836 -> a
+    46:52: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):880:886 -> a
+    53:53: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):881:881 -> a
+    54:55:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):893:894 -> a
+    56:56:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> a
+    56:56:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):896 -> a
+    57:63:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):896:902 -> a
+    64:64:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):894:894 -> a
+    65:73:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):912:920 -> a
+    74:74:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):919:919 -> a
+    75:75:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):913:913 -> a
+    76:76:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):921:921 -> a
+    77:80:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):926:929 -> a
+    81:85:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):934:938 -> a
+    86:92:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):943:949 -> a
+    93:93:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):944:944 -> a
+    94:94:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):948:948 -> a
+    95:100:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1052:1057 -> a
+    101:101:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1420:1420 -> a
+    102:102:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1449:1449 -> a
+    103:104:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():1454:1455 -> a
+    103:104:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1450 -> a
+    105:105:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1450:1450 -> a
+    1:2:boolean isRepackagingEnabled():590:591 -> a0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():667:667 -> b
+    2:35:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):842:875 -> b
+    36:36:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):937:937 -> b
+    37:42:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1564:1569 -> b
+    1:3:boolean isShrinking():567:567 -> b0
+    5:5:boolean isShrinking():569:569 -> b0
+    1:1:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):928:928 -> c
+    2:2:boolean canHaveArtCheckCastVerifierBug():1877:1877 -> c
+    1:1:boolean isStringSwitchConversionEnabled():1539:1539 -> c0
+    1:10:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):955:964 -> d
+    11:17:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):960:966 -> d
+    18:19:boolean canHaveArtInstanceOfVerifierBug():1832:1833 -> d
+    1:2:boolean keepInnerClassStructure():619:620 -> d0
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1909:1909 -> e
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():679:679 -> e0
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1901:1901 -> f
+    1:32:boolean printWarnings():972:1003 -> f0
+    33:72:boolean printWarnings():999:1038 -> f0
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1923:1923 -> g
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():675:675 -> g0
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1579:1579 -> h
+    1:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1454:1455 -> h0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1491:1491 -> i
+    1:1:boolean shouldBackportMethods():436:436 -> i0
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1560:1560 -> j
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.enableExperimentalRecordDesugaring():510:510 -> j0
+    1:1:boolean shouldDesugarRecords():514 -> j0
+    2:2:boolean shouldDesugarRecords():517:517 -> j0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1487:1487 -> j0
+    3:3:boolean shouldDesugarRecords():517 -> j0
+    1:1:boolean canUseConstantMethodHandle():1467:1467 -> k
+    1:1:boolean shouldKeepStackMapTable():440:440 -> k0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():432:432 -> k0
+    2:2:boolean shouldKeepStackMapTable():440 -> k0
+    3:4:boolean shouldKeepStackMapTable():440:441 -> k0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():432:432 -> k0
+    5:5:boolean shouldKeepStackMapTable():442 -> k0
+    6:6:boolean shouldKeepStackMapTable():443:443 -> k0
+    1:1:boolean canUseConstantMethodType():1471:1471 -> l
+    1:1:boolean shouldRerunEnqueuer():447:447 -> l0
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1479:1479 -> m
+    1:18:void signalFinishedToConsumers():483:500 -> m0
+    1:1:boolean canUseDexPcAsDebugInformation():1521:1521 -> n
+    1:2:boolean canUseFilledNewArrayOfObjects():1591:1592 -> o
+    1:1:boolean canUseInputStackMaps():624:624 -> p
+    1:1:boolean canUseInvokeCustom():1475:1475 -> q
+    1:1:boolean canUseInvokePolymorphic():1463:1463 -> r
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1459:1459 -> s
+    1:1:boolean canUseJavaUtilObjects():1548:1548 -> t
+    1:2:boolean canUseMultidex():1543:1544 -> u
+    1:1:boolean canUseNotInstruction():1627:1627 -> v
+    1:1:boolean canUsePrivateInterfaceMethods():1517:1517 -> w
+    1:1:boolean canUseRequireNonNull():1552:1552 -> x
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1600:1601 -> y
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():683:683 -> z
+com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.Si$a:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():1496:1496 -> <clinit>
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.xi$b:
+    1:1:void <clinit>():1507:1507 -> <clinit>
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.Si$b:
     boolean enableConstantPropagation -> a
     boolean enableTypePropagation -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1124:1124 -> <clinit>
-    1:11:void <init>():1124:1134 -> <init>
-    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1137:1138 -> a
-    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1124 -> a
-    3:3:void disableTypePropagationForTesting():1142:1142 -> a
-    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1148:1149 -> a
-    1:1:boolean isConstantPropagationEnabled():1161:1161 -> b
-    1:1:boolean isEnabled():1157:1157 -> c
-    1:1:boolean isTypePropagationEnabled():1165:1165 -> d
-com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.xi$c:
+    1:1:void <clinit>():1127:1127 -> <clinit>
+    1:11:void <init>():1127:1137 -> <init>
+    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1140:1141 -> a
+    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1127 -> a
+    3:3:void disableTypePropagationForTesting():1145:1145 -> a
+    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1151:1152 -> a
+    1:1:boolean isConstantPropagationEnabled():1164:1164 -> b
+    1:1:boolean isEnabled():1160:1160 -> c
+    1:1:boolean isTypePropagationEnabled():1168:1168 -> d
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.Si$c:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
-    1:9:void <init>():1113:1121 -> <init>
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.xi$d:
+    1:9:void <init>():1116:1124 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.Si$d:
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> a
-    1:2:void <clinit>():102:103 -> <clinit>
-    1:1:void <init>(java.lang.String,int):101:101 -> <init>
-    1:1:boolean isOff():106:106 -> a
-    1:1:boolean isOn():110:110 -> b
-com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.xi$e:
+    1:2:void <clinit>():104:105 -> <clinit>
+    1:1:void <init>(java.lang.String,int):103:103 -> <init>
+    1:1:boolean isOff():108:108 -> a
+    1:1:boolean isOn():112:112 -> b
+com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.Si$e:
     int maxGroupSize -> d
     boolean enable -> a
     boolean enableConstructorMerging -> b
     boolean enableJavaLambdaMerging -> c
-    1:10:void <init>():1169:1178 -> <init>
-    1:1:void enable():1185:1185 -> a
-    2:2:void enableIf(boolean):1189:1189 -> a
-    1:1:int getMaxGroupSize():1197:1197 -> b
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1209:1209 -> c
-    1:1:boolean isDisabled():1205 -> c
-    1:1:boolean isEnabled():1209:1209 -> d
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.xi$f:
+    1:10:void <init>():1172:1181 -> <init>
+    1:1:void disable():1184:1184 -> a
+    2:2:void enableIf(boolean):1192:1192 -> a
+    1:1:void enable():1188:1188 -> b
+    1:1:int getMaxGroupSize():1200:1200 -> c
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isEnabled():1212:1212 -> d
+    1:1:boolean isDisabled():1208 -> d
+    1:1:boolean isEnabled():1212:1212 -> e
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.Si$f:
     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):719:722 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.xi$g:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):722:725 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.Si$g:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1106:1108 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.xi$h:
+    1:3:void <init>():1109:1111 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.Si$h:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():97:98 -> <clinit>
-    1:1:void <init>(java.lang.String,int):96:96 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.xi$i:
+    1:2:void <clinit>():99:100 -> <clinit>
+    1:1:void <init>(java.lang.String,int):98:98 -> <init>
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.Si$i:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1099:1103 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.xi$j:
+    1:5:void <init>():1102:1106 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.Si$j:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode MINIFICATION -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:8:void <clinit>():1069:1076 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1067:1067 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1079:1079 -> a
-    1:1:boolean isSome():1095 -> a
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.xi$k:
+    1:8:void <clinit>():1072:1079 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1070:1070 -> <init>
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1082:1082 -> a
+    1:1:boolean isSome():1098 -> a
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.Si$k:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:7:void <init>():1217:1223 -> <init>
-    1:1:boolean enableRemoveProtoEnumSwitchMap():1229:1229 -> a
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():1240:1240 -> b
-    1:1:boolean isProtoShrinkingEnabled():1233:1233 -> c
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.xi$l:
-    boolean allowInvokeErrors -> m
+    1:7:void <init>():1220:1226 -> <init>
+    1:1:boolean enableRemoveProtoEnumSwitchMap():1232:1232 -> a
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():1243:1243 -> b
+    1:1:boolean isProtoShrinkingEnabled():1236:1236 -> c
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.Si$l:
+    boolean allowTypeErrors -> m
     boolean allowOutlinerInterfaceArrayArguments -> d0
+    java.util.function.BiConsumer verticallyMergedClassesConsumer -> i
     boolean allowStaticInterfaceMethodsForPreNApiLevel -> P
     boolean readInputStackMaps -> b0
     java.util.Set allowedUnusedDontWarnPatterns -> V
-    boolean enableInvokeSuperToInvokeVirtualRewriting -> u
+    boolean enableDeadSwitchCaseElimination -> u
     java.util.function.Function repackagingConfigurationFactory -> e
     boolean allowConflictingSyntheticTypes -> X
-    boolean reportUnusedProguardConfigurationRules -> q
+    boolean disableL8AnnotationRemoval -> q
     com.android.tools.r8.utils.IROrdering irOrdering -> b
     boolean allowInvalidCfAccessFlags -> T
     boolean enableExperimentalRecordDesugaring -> y
     java.lang.Runnable hookInIrConversion -> g0
     java.util.function.Predicate cfByteCodePassThrough -> k0
     boolean enableNarrowAndWideningingChecksInD8 -> G
+    java.util.function.BiFunction horizontalClassMergingTarget -> g
+    java.util.function.Consumer waveModifier -> j
     boolean forceJumboStringProcessing -> C
     java.util.function.Consumer inlineeIrModifier -> I
-    java.util.function.BiConsumer verticallyMergedClassesConsumer -> h
+    java.util.function.BiConsumer unboxedEnumsConsumer -> h
     boolean trackDesugaredAPIConversions -> M
-    boolean allowUnnecessaryDontWarnWildcards -> n
-    boolean allowCheckDiscardedErrors -> j
+    boolean allowInvokeErrors -> n
     boolean checkForNotExpandingMainDexTracingResult -> U
-    boolean enableSwitchToIfRewriting -> v
-    boolean alwaysUseExistingAccessInfoCollectionsInMemberRebinding -> r
+    boolean enableInvokeSuperToInvokeVirtualRewriting -> v
+    boolean reportUnusedProguardConfigurationRules -> r
     byte[] forceDexVersionBytes -> a
     java.io.PrintStream whyAreYouNotInliningConsumer -> L
     boolean enableD8ResourcesPassThrough -> Y
@@ -82643,17 +82970,15 @@
     java.util.function.Consumer callSiteOptimizationInfoInspector -> j0
     boolean measureProguardIfRuleEvaluations -> h0
     com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> i0
-    java.util.function.Consumer waveModifier -> i
     int verificationSizeLimitInBytesOverride -> Q
     boolean enumUnboxingRewriteJavaCGeneratedMethod -> N
-    boolean allowUnusedDontWarnRules -> o
+    boolean allowUnnecessaryDontWarnWildcards -> o
     boolean verifyKeptGraphInfo -> a0
-    boolean allowInjectedAnnotationMethods -> k
-    java.util.function.BiConsumer unboxedEnumsConsumer -> g
+    boolean allowCheckDiscardedErrors -> k
     boolean disableStackMapVerification -> c0
-    boolean enableEnumUnboxingDebugLogs -> w
+    boolean enableSwitchToIfRewriting -> w
     boolean forceIRForCfToCfDesugar -> R
-    boolean enableCheckCastAndInstanceOfRemoval -> s
+    boolean alwaysUseExistingAccessInfoCollectionsInMemberRebinding -> s
     java.util.function.Consumer processingContextsConsumer -> d
     java.util.Set validInliningReasons -> D
     boolean allowNonAbstractClassesWithAbstractMethods -> Z
@@ -82661,36 +82986,37 @@
     java.util.function.BiConsumer enqueuerInspector -> c
     boolean placeExceptionalBlocksLast -> A
     boolean assertConsistentRenamingOfSignature -> O
-    boolean disableL8AnnotationRemoval -> p
+    boolean allowUnusedDontWarnRules -> p
     int basicBlockMuncherIterationLimit -> J
     java.util.function.BiConsumer horizontallyMergedClassesConsumer -> f
     boolean dontReportFailingCheckDiscarded -> K
-    boolean allowTypeErrors -> l
+    boolean allowInjectedAnnotationMethods -> l
     int limitNumberOfClassesPerDex -> e0
     com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> f0
     boolean repackageWithNoMinification -> W
     boolean forceRedundantConstNumberRemoval -> x
     boolean disableMappingToOriginalProgramVerification -> S
-    boolean enableDeadSwitchCaseElimination -> t
+    boolean enableCheckCastAndInstanceOfRemoval -> t
     boolean forceNameReflectionOptimization -> F
     boolean dontCreateMarkerInD8 -> B
-    1:155:void <init>():1244:1398 -> <init>
-    void lambda$new$0(java.util.Deque) -> a
-    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1247:1247 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.xi$l$a:
+    1:157:void <init>():1247:1403 -> <init>
+    com.android.tools.r8.graph.DexProgramClass lambda$new$0(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass) -> a
+    void lambda$new$1(java.util.Deque) -> a
+    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1250:1250 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.Si$l$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1370:1372 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1376:1377 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1378:1378 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.xi$l$b:
+    1:3:void <init>():1375:1377 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1381:1382 -> 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):1383:1383 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.Si$l$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1388:1391 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.xi$m:
+    1:4:void <init>():1393:1396 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.Si$m:
     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):731:733 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.yi:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):734:736 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.Ti:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -82698,26 +83024,26 @@
     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.aj:
-    1:1:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):66:66 -> a
-    2:2:int size(java.lang.Iterable):75:75 -> a
-    3:3:java.util.Iterator lambda$singleton$1(java.lang.Object):96:96 -> a
-    4:4:java.lang.Iterable flatMap(java.lang.Iterable,java.util.function.Function):122:122 -> a
-    5:6:java.lang.Iterable fromMethod(java.util.function.Consumer,java.util.function.Function):157:158 -> a
-    7:7:void lambda$fromMethod$2(java.util.List,java.util.function.Function,java.lang.Object):158:158 -> a
-    1:2:int firstIndexMatching(java.lang.Iterable,java.util.function.Predicate):56:57 -> b
-    3:3:java.lang.Iterable singleton(java.lang.Object):96:96 -> b
-    4:4:int sumInt(java.lang.Iterable):112:112 -> b
-    5:6:java.lang.Object com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Object,java.util.function.BiFunction,java.lang.Iterable):105:106 -> b
-    5:6:int sumInt(java.lang.Iterable):112 -> b
-    7:7:int sumInt(java.lang.Iterable):112:112 -> b
-    8:9:int sumInt(java.lang.Iterable,java.util.function.Function):116:117 -> b
-    1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):66:66 -> c
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.wj:
+    1:1:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):70:70 -> a
+    2:2:int size(java.lang.Iterable):79:79 -> a
+    3:3:java.util.Iterator lambda$singleton$1(java.lang.Object):100:100 -> a
+    4:4:java.lang.Iterable flatMap(java.lang.Iterable,java.util.function.Function):126:126 -> a
+    5:6:java.lang.Iterable fromMethod(java.util.function.Consumer,java.util.function.Function):161:162 -> a
+    7:7:void lambda$fromMethod$2(java.util.List,java.util.function.Function,java.lang.Object):162:162 -> a
+    1:2:int firstIndexMatching(java.lang.Iterable,java.util.function.Predicate):60:61 -> b
+    3:3:java.lang.Iterable singleton(java.lang.Object):100:100 -> b
+    4:4:int sumInt(java.lang.Iterable):116:116 -> b
+    5:6:java.lang.Object com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Object,java.util.function.BiFunction,java.lang.Iterable):109:110 -> b
+    5:6:int sumInt(java.lang.Iterable):116 -> b
+    7:7:int sumInt(java.lang.Iterable):116:116 -> b
+    8:9:int sumInt(java.lang.Iterable,java.util.function.Function):120:121 -> b
+    1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):70:70 -> c
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):49:49 -> c
-    2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):66 -> c
-    3:4:java.util.List toNewArrayList(java.lang.Iterable):82:83 -> c
-    5:5:java.lang.Iterable transform(java.lang.Iterable,java.util.function.Function):88:88 -> c
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.jj:
+    2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):70 -> c
+    3:4:java.util.List toNewArrayList(java.lang.Iterable):86:87 -> c
+    5:5:java.lang.Iterable transform(java.lang.Iterable,java.util.function.Function):92:92 -> c
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Fj:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -82730,12 +83056,12 @@
     12:24:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):163:175 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):92:94 -> b
     4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):140:143 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.hj:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Dj:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     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.ij:
+com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.Ej:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
@@ -82744,7 +83070,7 @@
     1:3:java.lang.Object advance():55:57 -> k
     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.Aj:
+com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.Wj:
     com.android.tools.r8.StringConsumer consumer -> c
     java.lang.String separator -> b
     java.lang.StringBuilder builder -> d
@@ -82753,7 +83079,7 @@
     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.Rn:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.oo:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -82761,15 +83087,15 @@
     2:3:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> b
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.Qn:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.no:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.qo:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.No:
     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.yo:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.Vo:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -82780,12 +83106,12 @@
     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.Co:
+com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.Zo:
     1:4:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):28:31 -> a
     5:5:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     5:5:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31 -> a
     6:9: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.Do:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.ap:
     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
@@ -82798,80 +83124,90 @@
 com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.J:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():67:67 -> <clinit>
-    1:1:void access$1200(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):67:67 -> a
-    2:2:com.android.tools.r8.ir.code.Position access$900(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):67:67 -> a
-    3:28:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):274:299 -> a
-    29:36:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):298:305 -> a
-    37:46:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):303:312 -> a
-    47:47:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():27:27 -> a
-    47:47:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):315 -> a
-    48:48:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):315:315 -> a
-    49:49:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):313:313 -> a
-    50:52:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):555:557 -> a
-    50:52:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):322 -> a
-    53:53:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):326:326 -> a
-    54:72:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):325:343 -> a
-    73:88:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):476:491 -> a
-    73:88:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):343 -> a
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():582:582 -> a
-    89:89: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):161 -> a
-    89:89:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):491 -> a
-    89:89:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):343 -> a
-    90:90: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):162:162 -> a
-    90:90:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):491 -> a
-    90:90:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):343 -> a
-    91:107:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):495:511 -> a
-    91:107:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):343 -> a
-    108:127:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):347:366 -> a
-    128:128:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1511:1511 -> a
-    128:128:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):366 -> a
-    129:129:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):366:366 -> a
-    130:133:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):754:757 -> a
-    130:133:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):367 -> a
-    134:134:void com.android.tools.r8.utils.Pair.<init>():20:20 -> a
-    134:134:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):757 -> a
-    134:134:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):367 -> a
-    135:168:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):759:792 -> a
-    135:168:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):367 -> a
-    169:177:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):789:797 -> a
-    169:177:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):367 -> a
-    178:278:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):643:743 -> a
-    178:278:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):369 -> a
-    279:282:boolean verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):802:805 -> a
-    279:282:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):744 -> a
-    279:282:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):369 -> a
-    283:283:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):746:746 -> a
-    283:283:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):369 -> a
-    284:286:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):372:374 -> a
-    287:310:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):816:839 -> a
-    287:310:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):375 -> a
-    311:311:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):832:832 -> a
-    311:311:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):375 -> a
-    312:386:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):380:454 -> a
-    387:397:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):452:462 -> a
-    398:410:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):459:471 -> a
-    411:412: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):292:293 -> a
-    413:413: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):291:291 -> a
-    414:414:void lambda$run$1(com.android.tools.r8.naming.mappinginformation.MappingInformation):307:307 -> a
-    415:415:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$4(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):403:403 -> a
-    416:416:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):404:404 -> a
-    417:430:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):517:530 -> a
-    431:431:void sortMethods(java.util.List):539:539 -> a
-    432:433:int lambda$sortMethods$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):541:542 -> a
-    434:434:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1461:1461 -> a
-    434:434:int lambda$sortMethods$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):545 -> a
-    435:435:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Supplier):567:567 -> a
-    436:443:void lambda$addFieldsToClassNaming$6(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):569:576 -> a
-    444:451:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):583:590 -> a
-    452:459:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):601:608 -> a
-    452:459:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):591 -> a
-    460:462:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):592:594 -> a
-    463:463:java.util.List lambda$groupMethodsByRenamedName$7(com.android.tools.r8.graph.DexString):593:593 -> a
-    464:469:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):614:619 -> a
-    470:472:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):627:629 -> a
-    1:1:void lambda$run$2(com.android.tools.r8.naming.mappinginformation.MappingInformation):317:317 -> b
-    2:5:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):845:848 -> b
-    6:9:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):860:863 -> b
+    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$run$1(java.lang.Object):302 -> a
+    2:2:void access$1200(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):67:67 -> a
+    3:3:com.android.tools.r8.ir.code.Position access$900(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):67:67 -> a
+    4:38:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):274:308 -> a
+    39:39:boolean com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.isSupported(com.android.tools.r8.naming.MapVersion):26:26 -> a
+    39:39:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):307 -> a
+    40:40:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):310:310 -> a
+    41:41:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():32:32 -> a
+    41:41:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):312 -> a
+    42:42:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):312:312 -> a
+    43:43:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):311:311 -> a
+    44:46:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):568:570 -> a
+    44:46:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):316 -> a
+    47:47:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):320:320 -> a
+    48:66:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):319:337 -> a
+    67:82:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):489:504 -> a
+    67:82:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):337 -> a
+    83:83:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():585:585 -> a
+    83:83: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):161 -> a
+    83:83:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):504 -> a
+    83:83:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):337 -> a
+    84:84: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):162:162 -> a
+    84:84:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):504 -> a
+    84:84:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):337 -> a
+    85:101:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):508:524 -> a
+    85:101:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):337 -> a
+    102:121:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):341:360 -> a
+    122:125:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):767:770 -> a
+    122:125:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):361 -> a
+    126:126:void com.android.tools.r8.utils.Pair.<init>():20:20 -> a
+    126:126:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):770 -> a
+    126:126:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):361 -> a
+    127:160:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):772:805 -> a
+    127:160:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):361 -> a
+    161:169:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):802:810 -> a
+    161:169:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):361 -> a
+    170:270:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):656:756 -> a
+    170:270:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):363 -> a
+    271:274:boolean verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):815:818 -> a
+    271:274:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):757 -> a
+    271:274:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):363 -> a
+    275:275:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):759:759 -> a
+    275:275:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):363 -> a
+    276:278:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):366:368 -> a
+    279:302:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):829:852 -> a
+    279:302:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):369 -> a
+    303:303:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):845:845 -> a
+    303:303:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):369 -> a
+    304:314:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):374:384 -> a
+    315:315:boolean com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.isSupported(com.android.tools.r8.naming.MapVersion):26:26 -> a
+    315:315:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):383 -> a
+    316:316:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():32:32 -> a
+    316:316:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):385 -> a
+    317:395:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):385:463 -> a
+    396:407:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):461:472 -> a
+    408:423:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):469:484 -> a
+    424:425: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):292:293 -> a
+    426:426: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):291:291 -> a
+    427:427:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):406:406 -> a
+    428:428: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):414:414 -> a
+    429:429: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):415:415 -> a
+    430:443:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):530:543 -> a
+    444:444:void sortMethods(java.util.List):552:552 -> a
+    445:446:int lambda$sortMethods$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):554:555 -> a
+    447:447:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1461:1461 -> a
+    447:447:int lambda$sortMethods$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):558 -> a
+    448:448:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Supplier):580:580 -> a
+    449:456:void lambda$addFieldsToClassNaming$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):582:589 -> a
+    457:464:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):596:603 -> a
+    465:472:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):614:621 -> a
+    465:472:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):604 -> a
+    473:475:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):605:607 -> a
+    476:476:java.util.List lambda$groupMethodsByRenamedName$10(com.android.tools.r8.graph.DexString):606:606 -> a
+    477:482:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):627:632 -> a
+    483:485:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):640:642 -> 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$2(java.lang.Object):312 -> b
+    2:5:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):858:861 -> b
+    6:9:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):873:876 -> 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$3(java.lang.Object):406 -> 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$7(java.lang.Object):477 -> d
 com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.B:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
@@ -82880,26 +83216,26 @@
     java.util.List val$mappedPositions -> j
     int emittedPc -> g
     java.util.List val$processedEvents -> l
-    1:1:void <clinit>():660:660 -> <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):660:663 -> <init>
-    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):676:689 -> a
-    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):698:698 -> a
-    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):703:703 -> a
-    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):708:708 -> a
-    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):715:716 -> a
-    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):721:722 -> a
-    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):727:728 -> a
-    1:3:void flushPc():667:669 -> f
+    1:1:void <clinit>():673:673 -> <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):673:676 -> <init>
+    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):689:702 -> a
+    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):711:711 -> a
+    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):716:716 -> a
+    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):721:721 -> a
+    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):728:729 -> a
+    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):734:735 -> a
+    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):740:741 -> a
+    1:3:void flushPc():680:682 -> f
 com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.utils.C:
     com.android.tools.r8.utils.Pair val$lastPosition -> g
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> h
     boolean $assertionsDisabled -> j
     java.util.List val$mappedPositions -> i
-    1:1:void <clinit>():760:760 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):760:760 -> <init>
-    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):763:769 -> a
-    8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):766:779 -> a
-    22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):774:774 -> a
+    1:1:void <clinit>():773:773 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):773:773 -> <init>
+    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):776:782 -> a
+    8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):779:792 -> a
+    22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):787:787 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.D:
     1:1:void <init>():75:75 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):75:75 -> <init>
@@ -82971,15 +83307,15 @@
     17:18:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):211 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.I:
     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.ap:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.xp:
     1:1:java.lang.Object first(java.util.List):49:49 -> a
     2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):66:67 -> a
     4:6:java.util.List map(java.util.Collection,java.util.function.Function):83:85 -> a
     7:22:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):107:122 -> a
     23:24:java.util.ArrayList newArrayList(com.android.tools.r8.utils.ForEachable):138:139 -> a
     1:1:java.lang.Object last(java.util.List):62:62 -> b
-com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.ap$a:
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.Fp:
+com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.xp$a:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.cq:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -82995,7 +83331,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.Vp:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.sq:
     1:9:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:29 -> a
     10:10:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -83010,15 +83346,13 @@
     36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     36:36:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     37:37:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.Xp:
-    1:2:java.util.Map map(java.util.Map,java.util.function.IntFunction,java.util.function.Function,java.util.function.Function,java.util.function.BiFunction):29:30 -> a
-    3:7:void lambda$map$0(java.util.function.Function,java.util.function.Function,java.util.Map,java.util.function.BiFunction,java.lang.Object,java.lang.Object):32:36 -> a
-    8:8:boolean lambda$removeIdentityMappings$1(java.util.Map$Entry):43:43 -> a
-    9:9:void removeIdentityMappings(java.util.Map):43:43 -> a
+com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.uq:
+    1:1:boolean lambda$removeIdentityMappings$1(java.util.Map$Entry):43:43 -> a
+    2:2:void removeIdentityMappings(java.util.Map):43:43 -> a
     1:1:java.lang.String lambda$toString$2(java.util.Map$Entry):48:48 -> b
     2:2:java.lang.String toString(java.util.Map):48:48 -> b
     3:3:java.lang.String toString(java.util.Map):47:47 -> b
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.cr:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.vr:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -83032,7 +83366,7 @@
     7:10:int doHash(java.lang.Object):15 -> a
     11:11:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> b
-com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.kr:
+com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.Dr:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -83057,7 +83391,7 @@
     13:18:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):32:37 -> b
     19:31:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):36:48 -> b
     32:40:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):45:53 -> b
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.lr:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.Er:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -83068,10 +83402,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.NumberUtils -> com.android.tools.r8.internal.pt:
+com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.Jt:
     boolean is16Bit(long) -> a
     boolean is32Bit(long) -> b
-com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.Wu:
     1:1:boolean getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
 com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.K:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
@@ -83095,7 +83429,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.Ku:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.ev:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> c
     com.android.tools.r8.utils.OptionalBool TRUE -> a
     com.android.tools.r8.utils.OptionalBool FALSE -> b
@@ -83104,22 +83438,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.Ku$a:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.ev$a:
     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.Ku$b:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.ev$b:
     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.Ku$c:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.ev$c:
     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.Mu:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.gv:
     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
@@ -83127,14 +83461,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.Mu$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.gv$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.Qu:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.kv:
     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>
@@ -83142,14 +83476,14 @@
     1:1:com.android.tools.r8.position.Position getPosition():24:24 -> b
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():29:29 -> hashCode
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.dv:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.xv:
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.jv:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.Dv:
 # {"id":"sourceFile","fileName":"Pair.java"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -83161,7 +83495,7 @@
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Jv:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.dw:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -83170,13 +83504,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.Kv:
+com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.ew:
     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.Uv:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.ow:
     java.util.Map content -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.PreloadedClassFileProvider$1):19:19 -> <init>
     2:3:void <init>(java.util.Map):37:38 -> <init>
@@ -83195,8 +83529,8 @@
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):48:53 -> getProgramResource
     7:7:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):52:52 -> getProgramResource
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.Uv$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.Uv$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.ow$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.ow$b:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -83205,11 +83539,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.Uv$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.ow$c:
     java.lang.String descriptor -> e
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.mw:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.Gw:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -83237,13 +83571,13 @@
     22: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.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68:68 -> a
     1:3:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:76 -> b
-    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> b
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():695:695 -> b
     4:4:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> b
     5:5:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> b
     6:6:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> b
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> c
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.Nw:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -83254,7 +83588,7 @@
     4:4:int com.android.tools.r8.utils.ProgramMethodEquivalence.doHash(com.android.tools.r8.graph.ProgramMethod):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
     5:5:com.android.tools.r8.utils.ProgramMethodEquivalence get():17:17 -> a
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.sA:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.TA:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -83278,18 +83612,18 @@
     1:1:void error(com.android.tools.r8.Diagnostic):102:102 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):84:84 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):93:93 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.sA$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.TA$a:
     1:1:void <init>():49:49 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.sA$b:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.TA$b:
     int[] $SwitchMap$com$android$tools$r8$DiagnosticsLevel -> a
     1:1:void <clinit>():66:66 -> <clinit>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.sA$c:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.TA$c:
     com.android.tools.r8.DiagnosticsLevel from -> a
     com.android.tools.r8.DiagnosticsLevel to -> b
     java.lang.String diagnosticsClassName -> c
     1:4:void <init>(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.DiagnosticsLevel,java.lang.String):25:28 -> <init>
     1:7:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):32:38 -> a
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.tB:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.TB:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -83302,7 +83636,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.uB:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.UB:
     int minor -> b
     int patch -> c
     int major -> a
@@ -83318,14 +83652,14 @@
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():77:77 -> hashCode
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.yB:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.YB:
     1:2:java.util.Set newIdentityHashSet(java.lang.Object):16:17 -> a
     3:4:java.util.Set newIdentityHashSet(java.lang.Iterable):28:29 -> a
     5:7:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable):34:36 -> a
     8:11:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):41:44 -> a
     12:12:java.util.Set newIdentityHashSet(int):49:49 -> a
     13:15:java.util.Set mapIdentityHashSet(java.util.Set,java.util.function.Function):59:61 -> a
-com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.UC:
     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>
@@ -83416,7 +83750,7 @@
     5:5:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
     1:1:com.android.tools.r8.utils.StringUtils$BraceType[] values():25:25 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.uE:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.WE:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -83425,7 +83759,7 @@
     1:15:void <clinit>():13:27 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.uE$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.WE$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -83489,7 +83823,7 @@
 com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.utils.a0:
     java.lang.Object apply(java.lang.Object,int) -> a
 com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.b0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.NE:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.pF:
     java.util.Stack stack -> b
     com.android.tools.r8.utils.Timing EMPTY -> d
     boolean $assertionsDisabled -> e
@@ -83534,20 +83868,20 @@
     1:1:boolean access$800(com.android.tools.r8.utils.Timing):25:25 -> c
     2:3:void end():374:375 -> c
     1:6:void report():379:384 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.NE$a:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.pF$a:
     1:1:void <init>(java.lang.String,boolean):30:30 -> <init>
     void begin(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):33:33 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.NE$a$a:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.pF$a$a:
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):33:33 -> <init>
     void add(java.util.Collection) -> a
     void end() -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.NE$b:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.pF$b:
     long used -> a
     1:2:void <init>(long):101:102 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.NE$c:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.pF$c:
     java.util.Map children -> c
     long start_time -> e
     java.lang.String title -> a
@@ -83608,7 +83942,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():156 -> toString
     5:5:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.NE$d:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.pF$d:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Timing$Node slowest -> d
     int taskCount -> c
@@ -83624,7 +83958,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):305:305 -> a
     25:26:void end():315:316 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):225:225 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.OE:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.qF:
     boolean $assertionsDisabled -> k
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
@@ -83643,23 +83977,23 @@
     39:39:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):259:259 -> a
     1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):264:264 -> b
     1:1:java.lang.String toString():270:270 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.PE:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.rF:
     com.android.tools.r8.utils.Timing$Node mergeTarget -> a
     com.android.tools.r8.utils.Timing$Node mergeSource -> b
     1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):279:281 -> <init>
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.ZE:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.BF:
     com.android.tools.r8.utils.TraversalContinuation CONTINUE -> a
     com.android.tools.r8.utils.TraversalContinuation BREAK -> b
     1:2:void <clinit>():8:9 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean shouldBreak():12:12 -> a
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.dF:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.EF:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.eF:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.FF:
     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.fF:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.GF:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.BF:
+com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.bG:
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:int lambda$static$0(com.android.tools.r8.references.TypeReference,com.android.tools.r8.references.TypeReference):24:24 -> a
@@ -83701,7 +84035,7 @@
 com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.utils.d0$a:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():33:33 -> <clinit>
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.aH:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.wH:
     java.util.Deque workingList -> a
     java.util.Set seen -> b
     boolean $assertionsDisabled -> c
@@ -83723,7 +84057,7 @@
     1:2:com.android.tools.r8.utils.WorkList newEqualityWorkList(java.lang.Iterable):24:25 -> d
     3:4:java.lang.Object next():98:99 -> d
     1:2:com.android.tools.r8.utils.WorkList newIdentityWorkList(java.lang.Iterable):46:47 -> e
-com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.internal.aH$a:
+com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.internal.wH$a:
     com.android.tools.r8.utils.WorkList$EqualityTest IDENTITY -> b
     com.android.tools.r8.utils.WorkList$EqualityTest HASH -> a
     1:2:void <clinit>():107:108 -> <clinit>
@@ -83867,11 +84201,11 @@
     1:1:java.util.Collection values():15 -> values
     2:2:java.util.Set values():157:157 -> values
 com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.z2:
-com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.qa:
+com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.ra:
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):22:22 -> <init>
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet create():32:32 -> b
-com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.sa:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> c
     java.util.function.Supplier backingFactory -> b
@@ -83891,7 +84225,7 @@
     1:1:java.util.Iterator iterator():61:61 -> iterator
     1:1:int size():74:74 -> size
     1:1:java.util.stream.Stream stream():78:78 -> stream
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.za:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Aa:
     java.util.Set backing -> a
     1:2:void <init>(java.util.Set):21:22 -> <init>
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet create():26:26 -> a
@@ -83921,7 +84255,7 @@
     2:2:void removeAll(java.lang.Iterable):89:89 -> c
     1:1:void removeAllMethods(java.lang.Iterable):93:93 -> d
     1:1:java.util.Iterator iterator():77:77 -> iterator
-com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.Za:
+com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.ab:
     1:1:void <init>():14:14 -> <init>
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     1:1:java.util.Set getKeys(java.lang.Object):81:81 -> a
@@ -83931,7 +84265,7 @@
     java.lang.Object getRepresentativeKey(java.lang.Object) -> c
     1:1:java.util.Set keySet():96:96 -> keySet
     1:1:java.util.Set values():101:101 -> values
-com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.Je:
+com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.ef:
     java.util.Map backing -> a
     java.util.function.Function valueToKeyMapping -> b
     1:1:void <init>(java.util.function.Function):21:21 -> <init>
@@ -83956,7 +84290,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.Se:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.nf:
     boolean isClosed -> a
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -83980,7 +84314,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.Ye:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.tf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1):17:17 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):21:22 -> <init>
@@ -84046,13 +84380,13 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):17:17 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.tailMap(java.lang.Integer):135:135 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):17 -> tailMap
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.We:
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Xe:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.rf:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.sf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> a
     1:3:void <init>():41:43 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder put(int,java.lang.Object):46:46 -> a
     2:2:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap build():51:51 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.Ip:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.fq:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>():17:17 -> <init>
@@ -84066,7 +84400,7 @@
     7:7:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38 -> a
     8:9:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38:39 -> a
     1:1:int size():30:30 -> b
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.Jp:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.gq:
     java.util.Set methods -> b
     java.util.function.IntFunction factory -> a
     1:3:void <init>(java.util.function.IntFunction,java.util.Set):22:24 -> <init>
@@ -84080,9 +84414,9 @@
     1:2:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createForIdentitySet():28:29 -> b
     3:8:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):51:56 -> b
     1:1:boolean isEmpty():74:74 -> c
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.gs:
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.hs:
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.As:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.Lw:
     java.util.Map backing -> a
     com.android.tools.r8.utils.collections.ProgramFieldSet EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -84096,7 +84430,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.ProgramMethodMultiset -> com.android.tools.r8.internal.uw:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.Ow:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):20:21 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createHash():25:25 -> a
@@ -84106,7 +84440,7 @@
     4:4:void createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,int):29:29 -> a
     5:5:void forEachEntry(java.util.function.ObjIntConsumer):33:33 -> a
     6:6:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,int):33:33 -> a
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.vw:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.Pw:
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> d
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):25:25 -> <init>
@@ -84123,7 +84457,7 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():59:59 -> d
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():63:63 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):39:39 -> g
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.rC:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.RC:
     com.android.tools.r8.utils.collections.SortedProgramMethodSet EMPTY -> e
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):29:29 -> <init>
@@ -84141,7 +84475,7 @@
     1:1:java.util.SortedMap lambda$create$1():44:44 -> i
     1:1:java.util.SortedMap lambda$createConcurrent$2():50:50 -> j
     1:1:java.util.SortedMap lambda$static$0():26:26 -> k
-com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.l8:
     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
@@ -84156,7 +84490,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.n8:
+com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.o8:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -84177,8 +84511,8 @@
     16:16:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):79 -> a
     17:21:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):80:84 -> a
     22:24:int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):97:99 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.l8:
-com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.m8:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.m8:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.n8:
     com.android.tools.r8.utils.structural.CompareToVisitorBase parent -> a
     java.lang.Object item1 -> b
     boolean $assertionsDisabled -> e
@@ -84248,17 +84582,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.o8:
+com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.p8:
     com.android.tools.r8.naming.NamingLens namingLens -> b
     1:2:void <init>(com.android.tools.r8.naming.NamingLens):26:27 -> <init>
     1:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):32:35 -> a
-    5:5:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    5:5:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
     5:5:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):35 -> a
     6:6:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):40:40 -> a
     7:7:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
     7:7:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):40 -> a
     8:8:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):44:44 -> a
-    9:9:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    9:9:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
     9:9:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):44 -> a
     10:10:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):48:48 -> a
     11:11:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
@@ -84267,43 +84601,43 @@
     13:13:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):78:78 -> a
     13:13:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):53 -> a
     14:14:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):57:57 -> a
-    15:15:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    15:15:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
     15:15:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):57 -> a
     16:16:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):61:61 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.q8:
     java.util.function.ToIntFunction stringTable -> c
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction):16:17 -> <init>
     1:1:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):22:22 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):22 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.r8:
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:2:void <init>(com.android.tools.r8.utils.structural.RepresentativeMap):23:24 -> <init>
     1:3:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):29:31 -> a
-    4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):57:57 -> a
+    4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
     4:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):31 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.r8:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.s8:
     java.util.function.ToIntFunction typeTable -> d
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction):19:20 -> <init>
     1:1:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):25:25 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):25 -> a
-com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.u9:
     com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
     1:1:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21:21 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):17:18 -> a
     2:3:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21 -> a
-com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.w9:
     com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
     1:1:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):22:22 -> a
-com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Vb:
+com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Wb:
     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.Vb$a:
+com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.Wb$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.ze:
     int $r8$clinit -> d
     java.lang.Object item -> a
     int hashCode -> b
@@ -84332,7 +84666,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.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Je:
     com.android.tools.r8.com.google.common.hash.Hasher hash -> a
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.<init>():18:18 -> <init>
@@ -84342,29 +84676,26 @@
     1:1:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):30:30 -> a
     2:2:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):34:34 -> a
     2:2:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):0 -> a
-    3:3:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):0:0 -> a
-    3:3:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):34 -> a
-    3:3:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):0 -> a
-    41:41:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38:38 -> a
-    42:43:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitItemIterator(java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):83:84 -> a
-    42:43:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38 -> a
-    44:44:void visitBool(boolean):43:43 -> a
-    45:45:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):46:46 -> a
-    45:45:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):0 -> a
-    46:46:void visitInt(int):48:48 -> a
-    47:47:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):50:50 -> a
-    47:47:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):0 -> a
-    48:48:void visitFloat(float):53:53 -> a
-    49:49:void visitLong(long):58:58 -> a
-    50:50:void visitDouble(double):63:63 -> a
-    51:51:void visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
-    52:52:void visitDexType(com.android.tools.r8.graph.DexType):73:73 -> a
-    53:53:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
-    53:53:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
-    54:54:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):78:78 -> a
+    3:3:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38:38 -> a
+    4:5:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitItemIterator(java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):83:84 -> a
+    4:5:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemCollection(java.util.Collection):38 -> a
+    6:6:void visitBool(boolean):43:43 -> a
+    7:7:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):46:46 -> a
+    7:7:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexField(com.android.tools.r8.graph.DexField):0 -> a
+    8:8:void visitInt(int):48:48 -> a
+    9:9:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):50:50 -> a
+    9:9:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):0 -> a
+    10:10:void visitFloat(float):53:53 -> a
+    11:11:void visitLong(long):58:58 -> a
+    12:12:void visitDouble(double):63:63 -> a
+    13:13:void visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
+    14:14:void visitDexType(com.android.tools.r8.graph.DexType):73:73 -> a
+    15:15:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitDexString(com.android.tools.r8.graph.DexString):68:68 -> a
+    15:15:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
+    16:16:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):78:78 -> a
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexReference(com.android.tools.r8.graph.DexReference):54:54 -> b
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$1 -> com.android.tools.r8.internal.me:
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$1 -> com.android.tools.r8.internal.He:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.Ie:
     java.lang.Object item -> b
     com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence parent -> a
     boolean $assertionsDisabled -> c
@@ -84393,7 +84724,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):93 -> b
     1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):150:152 -> i
     1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):93 -> i
-com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.Ou:
+com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.iv:
     1:1:void <clinit>():7:7 -> <clinit>
     1:2:boolean isEqualTo(java.lang.Object):16:17 -> a
     3:3:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
@@ -84405,13 +84736,13 @@
     1:1:com.android.tools.r8.utils.structural.Ordered min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> d
     2:2:boolean isGreaterThanOrEqualTo(java.lang.Object):61:61 -> d
     1:1:boolean isLessThanOrEqualTo(java.lang.Object):53:53 -> e
-com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.Ou$a:
+com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.iv$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.tA:
+com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.UA:
     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.cE:
-com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.dE:
+com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.EE:
+com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.FE:
     1:1:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):31:31 -> a
     2:2:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):42:42 -> a
     3:4:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):17:18 -> a
@@ -84424,13 +84755,13 @@
     com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping() -> k
     com.android.tools.r8.utils.structural.StructuralItem self() -> n
     1:3:java.lang.String hashForTesting():69:71 -> o
-com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.dE$a:
+com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.FE$a:
     int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.dE$b:
+com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.FE$b:
     void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.eE:
+com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.GE:
     void apply(com.android.tools.r8.utils.structural.StructuralSpecification) -> a
-com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.fE:
+com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.HE:
     1:1:void <init>():18:18 -> <init>
     boolean lambda$withCustomItem$0(java.lang.Object) -> a
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a