Update D8 and R8 to 3.0.31-dev

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

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

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I15d1cc1131b0d849dcb6449c9e2928f5c56c40d9
diff --git a/r8.jar b/r8.jar
index 19c6479..a27502f 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 1dec03a..c1caf34 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 3.0.30-dev
+# compiler_version: 3.0.31-dev
 # compiler_hash: engineering
-# pg_map_id: e5ef16a
+# pg_map_id: 7cc9a30
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.l1:
     boolean $assertionsDisabled -> c
@@ -510,50 +510,54 @@
     1:1:com.android.tools.r8.CompilationMode valueOf(java.lang.String):7:7 -> valueOf
     1:1:com.android.tools.r8.CompilationMode[] values():7:7 -> values
 com.android.tools.r8.D8 -> com.android.tools.r8.D8:
-    1:3:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:104 -> a
-    4:15:void run(java.lang.String[]):127:138 -> a
-    4:15:void lambda$main$2(java.lang.String[]):150 -> a
-    16:17:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):155:156 -> a
-    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):170:175 -> a
-    24:26:void lambda$run$4(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):199:201 -> a
-    27:27:void lambda$run$5(java.lang.String):231:231 -> a
-    28:48:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):350:370 -> a
-    49:75: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:393 -> a
-    76:76:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():193:193 -> a
-    76:76: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):393 -> a
-    1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):122:122 -> b
-    1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):160:162 -> c
-    1:18:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):180:197 -> d
-    19:88:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):196:265 -> d
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():88:88 -> <clinit>
+    1:3:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:108 -> a
+    4:15:void run(java.lang.String[]):131:142 -> a
+    4:15:void lambda$main$2(java.lang.String[]):154 -> a
+    16:17:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):159:160 -> a
+    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
+    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
+    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
+    19:88:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):200:269 -> d
     89:92: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 -> d
-    89:92:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265 -> d
-    93:94:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267:268 -> d
+    89:92:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):269 -> d
+    93:94:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271:272 -> d
     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):268 -> d
-    99:102:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270:273 -> d
-    103:103:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():462:462 -> d
-    103:103:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):274 -> d
-    104:125:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):274:295 -> d
-    126:138:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):289:301 -> d
-    139:143:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):298:302 -> d
-    144:177:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):278:311 -> d
-    178:202:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):310:334 -> 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():462:462 -> 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):329 -> d
-    204:209:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):329:334 -> d
-    1:4:void main(java.lang.String[]):147:150 -> main
-    5:5:void main(java.lang.String[]):148:148 -> main
-    1:5:void run(com.android.tools.r8.D8Command):95:99 -> run
-    6:6:void run(com.android.tools.r8.D8Command):98:98 -> run
-    7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):117:120 -> run
-    11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):119:119 -> run
+    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
+    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
+    6:6:void run(com.android.tools.r8.D8Command):102:102 -> run
+    7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):121:124 -> run
+    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>():416:418 -> <init>
-    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):424:426 -> accept
-    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):425:425 -> accept
-    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):424:424 -> accept
-    1:1:java.util.Collection getProgramResources():431:431 -> getProgramResources
+    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
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> s
     com.android.tools.r8.com.google.common.collect.ImmutableList mainDexKeepRules -> y
@@ -566,20 +570,20 @@
     boolean intermediate -> r
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> t
     boolean $assertionsDisabled -> B
-    1:272:void <clinit>():52:323 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):53:53 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):53:53 -> <init>
-    3:26:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.graph.DexItemFactory):400:423 -> <init>
-    27:37:void <init>(boolean,boolean):427:437 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):346:346 -> a
-    1:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():442:505 -> b
-    65:71:com.android.tools.r8.DumpOptions dumpOptions():513:519 -> b
-    65:71:com.android.tools.r8.utils.InternalOptions getInternalOptions():507 -> b
-    72:72:com.android.tools.r8.utils.InternalOptions getInternalOptions():507:507 -> b
-    1:1:com.android.tools.r8.D8Command$Builder builder():337:337 -> builder
-    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):341:341 -> builder
-    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):359:359 -> parse
-    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):373:373 -> parse
+    1:272:void <clinit>():53:324 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):54:54 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):54:54 -> <init>
+    3:26:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.graph.DexItemFactory):401:424 -> <init>
+    27:37:void <init>(boolean,boolean):428:438 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):347:347 -> a
+    1:65:com.android.tools.r8.utils.InternalOptions getInternalOptions():443:507 -> b
+    66:72:com.android.tools.r8.DumpOptions dumpOptions():515:521 -> b
+    66:72:com.android.tools.r8.utils.InternalOptions getInternalOptions():509 -> b
+    73:73:com.android.tools.r8.utils.InternalOptions getInternalOptions():509:509 -> b
+    1:1:com.android.tools.r8.D8Command$Builder builder():338:338 -> builder
+    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):342:342 -> builder
+    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):360:360 -> parse
+    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):374:374 -> parse
 com.android.tools.r8.D8Command$1 -> com.android.tools.r8.D8Command$a:
 com.android.tools.r8.D8Command$Builder -> com.android.tools.r8.D8Command$Builder:
     java.util.List mainDexRules -> B
@@ -589,51 +593,51 @@
     boolean intermediate -> v
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> x
     boolean skipDump -> A
-    1:1:void <init>(com.android.tools.r8.D8Command$1):78:78 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):78:78 -> <init>
-    3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):78:78 -> <init>
-    4:4:void <init>():90:90 -> <init>
-    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):94:94 -> <init>
-    6:13:void <init>(com.android.tools.r8.DiagnosticsHandler):80:87 -> <init>
-    14:14:void <init>(com.android.tools.r8.utils.AndroidApp):98:98 -> <init>
-    15:22:void <init>(com.android.tools.r8.utils.AndroidApp):80:87 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder setSynthesizedClassesPrefix(java.lang.String):198:198 -> a
-    2:4:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):231:231 -> a
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):77:77 -> addClasspathFiles
-    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):77:77 -> addClasspathFiles
-    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):115:115 -> addClasspathFiles
-    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):123:123 -> addClasspathFiles
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):77:77 -> addClasspathResourceProvider
-    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):131:131 -> addClasspathResourceProvider
-    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):77:77 -> addDexProgramData
-    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):106:106 -> addDexProgramData
-    1:1:com.android.tools.r8.D8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):229:229 -> addMainDexRules
-    1:1:com.android.tools.r8.D8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):218:218 -> addMainDexRulesFiles
-    2:2:com.android.tools.r8.D8Command$Builder addMainDexRulesFiles(java.util.Collection):223:223 -> addMainDexRulesFiles
-    1:1:com.android.tools.r8.BaseCommand makeCommand():77:77 -> c
-    2:2:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):106:106 -> c
-    3:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path):223:223 -> c
+    1:1:void <init>(com.android.tools.r8.D8Command$1):79:79 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):79:79 -> <init>
+    3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):79:79 -> <init>
+    4:4:void <init>():91:91 -> <init>
+    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):95:95 -> <init>
+    6:13:void <init>(com.android.tools.r8.DiagnosticsHandler):81:88 -> <init>
+    14:14:void <init>(com.android.tools.r8.utils.AndroidApp):99:99 -> <init>
+    15:22:void <init>(com.android.tools.r8.utils.AndroidApp):81:88 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder setSynthesizedClassesPrefix(java.lang.String):199:199 -> a
+    2:4:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):232:232 -> a
+    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):78:78 -> addClasspathFiles
+    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):78:78 -> addClasspathFiles
+    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):116:116 -> addClasspathFiles
+    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):124:124 -> addClasspathFiles
+    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):78:78 -> addClasspathResourceProvider
+    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):132:132 -> addClasspathResourceProvider
+    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):78:78 -> addDexProgramData
+    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):107:107 -> addDexProgramData
+    1:1:com.android.tools.r8.D8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):230:230 -> addMainDexRules
+    1:1:com.android.tools.r8.D8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):219:219 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.D8Command$Builder addMainDexRulesFiles(java.util.Collection):224:224 -> addMainDexRulesFiles
+    1:1:com.android.tools.r8.BaseCommand makeCommand():78:78 -> c
+    2:2:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):107:107 -> c
+    3:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path):224:224 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:34:void validate():238:271 -> e
-    35:44:void validate():269:278 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():194:194 -> f
-    2:2:void lambda$addMainDexRulesFiles$2(java.util.Collection):223:223 -> f
-    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():165:165 -> getDesugarGraphConsumer
-    1:20:com.android.tools.r8.D8Command makeCommand():283:302 -> m
+    1:34:void validate():239:272 -> e
+    35:44:void validate():270:279 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():195:195 -> f
+    2:2:void lambda$addMainDexRulesFiles$2(java.util.Collection):224:224 -> f
+    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():166:166 -> getDesugarGraphConsumer
+    1:20:com.android.tools.r8.D8Command makeCommand():284:303 -> m
     21:21:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():506:506 -> m
-    21:21:com.android.tools.r8.D8Command makeCommand():303 -> m
-    22:37:com.android.tools.r8.D8Command makeCommand():303:318 -> m
-    38:38:com.android.tools.r8.D8Command makeCommand():284:284 -> m
-    1:1:com.android.tools.r8.D8Command$Builder skipDump():183:183 -> n
-    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):174:174 -> setDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):157:157 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):146:146 -> setIntermediate
-    1:1:com.android.tools.r8.D8Command$Builder setProguardInputMapFile(java.nio.file.Path):136:136 -> setProguardInputMapFile
+    21:21:com.android.tools.r8.D8Command makeCommand():304 -> m
+    22:37:com.android.tools.r8.D8Command makeCommand():304:319 -> m
+    38:38:com.android.tools.r8.D8Command makeCommand():285:285 -> m
+    1:1:com.android.tools.r8.D8Command$Builder skipDump():184:184 -> n
+    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):175:175 -> setDesugarGraphConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):158:158 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):147:147 -> setIntermediate
+    1:1:com.android.tools.r8.D8Command$Builder setProguardInputMapFile(java.nio.file.Path):137:137 -> setProguardInputMapFile
 com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.D8Command$b:
-    1:1:void <init>():55:55 -> <init>
-    2:2:void <init>(com.android.tools.r8.D8Command$1):55:55 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):59:64 -> error
-    7:13:void error(com.android.tools.r8.Diagnostic):62:68 -> error
+    1:1:void <init>():56:56 -> <init>
+    2:2:void <init>(com.android.tools.r8.D8Command$1):56:56 -> <init>
+    1:6:void error(com.android.tools.r8.Diagnostic):60:65 -> error
+    7:13:void error(com.android.tools.r8.Diagnostic):63:69 -> error
 com.android.tools.r8.D8CommandParser -> com.android.tools.r8.b:
     java.lang.String USAGE_MESSAGE -> g
     java.util.Set OPTIONS_WITH_PARAMETER -> f
@@ -757,20 +761,20 @@
     17:17:com.android.tools.r8.graph.LazyLoadedDexApplication com.android.tools.r8.dex.ApplicationReader.read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):132:132 -> a
     17:17:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):90 -> a
     18:18:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):97:97 -> a
-    19:19:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:96 -> a
-    20:20:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):401:401 -> a
-    20:20:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
-    21:40:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):101:120 -> a
-    41:41:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    41:41:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115 -> a
-    42:47:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115:120 -> a
-    48:48:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    48:48:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
-    49:49:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():691:691 -> a
-    50:50:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
-    51:68:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
-    69:80:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:57 -> 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 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.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.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
 com.android.tools.r8.DexFilePerClassFileConsumer -> com.android.tools.r8.DexFilePerClassFileConsumer:
     1:1:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):63:63 -> accept
     2:2:void accept(java.lang.String,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):73:73 -> accept
@@ -900,15 +904,12 @@
     2:12:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):139:149 -> a
     1:4:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String):47:50 -> run
     5:9:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String):49:53 -> run
-    10:45:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):64:99 -> run
-    46:46: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):401:401 -> run
-    46:46:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):102 -> run
-    47:67:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):105:125 -> run
-    68:77:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):123:132 -> run
-    78:80:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):130:132 -> run
-    81:81:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> run
-    81:81:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128 -> run
-    82:86:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128:132 -> run
+    10:71:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):64:125 -> run
+    72:81:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):123:132 -> run
+    82:84:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):130:132 -> run
+    85:85:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> run
+    85:85:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128 -> run
+    86:90:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128:132 -> run
     1:3:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):156:158 -> runD8ForTesting
 com.android.tools.r8.DiagnosticsHandler -> com.android.tools.r8.DiagnosticsHandler:
     1:10:void error(com.android.tools.r8.Diagnostic):23:32 -> error
@@ -12705,10 +12706,9 @@
 com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.tj:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
-    1:1:void add(java.lang.Number):76:76 -> a
-    2:2:void add(java.lang.String):85:85 -> a
-    3:5:void add(com.android.tools.r8.com.google.gson.JsonElement):95:97 -> a
-    6:9:boolean getAsBoolean():358:361 -> a
+    1:1:void add(java.lang.String):85:85 -> a
+    2:4:void add(com.android.tools.r8.com.google.gson.JsonElement):95:97 -> a
+    5:8:boolean getAsBoolean():358:361 -> a
     1:4:int getAsInt():310:313 -> b
     1:4:long getAsLong():294:297 -> e
     1:1:boolean equals(java.lang.Object):366:366 -> equals
@@ -12756,7 +12756,8 @@
     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:boolean has(java.lang.String):151:151 -> b
+    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:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:int hashCode():202:202 -> hashCode
@@ -22830,7 +22831,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():1456:1456 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1458:1458 -> c
     5:5:boolean classRequiresCode():855 -> c
     5:5:void visitEnd():863 -> c
     6:8:boolean classRequiresCode():855:857 -> c
@@ -26262,7 +26263,6 @@
     1:1:boolean isShortValue():99:99 -> isShortValue
     1:1:boolean isStringValue():179:179 -> isStringValue
 com.android.tools.r8.internal.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.RC:
-# {"id":"com.android.tools.r8.synthesized"}
     void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$InternalSyntheticThrowCCEIfNotNull$41$1ec04e58ebe7a109095d9c5c56defd2aedfd9cb5793d5e063011d44c4131fd81$0.m(java.lang.Object) -> a
 com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.g6:
     com.android.tools.r8.graph.AppView appView -> a
@@ -28828,7 +28828,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():1904:1904 -> a
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():1906:1906 -> 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
@@ -30479,7 +30479,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():1706:1706 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1708:1708 -> 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
@@ -33327,7 +33327,7 @@
     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():1843:1843 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1845:1845 -> 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
@@ -35540,7 +35540,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():1779:1779 -> a
+    242:242:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1781:1781 -> 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
@@ -35991,14 +35991,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):2354:2354 -> a
+    62:62:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> 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):2420:2420 -> 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.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
@@ -36010,7 +36010,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):2354:2354 -> a
+    88:88:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> 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
@@ -36023,15 +36023,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):2533:2535 -> a
+    152:154:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2541:2543 -> 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():2543:2544 -> a
-    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2538 -> 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: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):2539:2539 -> a
+    157:157:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2547:2547 -> 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):2564:2564 -> a
+    169:169:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2572:2572 -> 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
@@ -36054,12 +36054,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):2420:2420 -> 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.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):2609:2612 -> 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.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
@@ -36141,26 +36141,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():2697:2727 -> a
+    338:368:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2705:2735 -> 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():2727 -> a
+    369:369:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2735 -> 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():2727:2727 -> a
+    370:370:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2735:2735 -> 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():2726:2740 -> a
+    371:385:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2734:2748 -> 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():2744 -> a
+    386:397:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2752 -> 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():2745:2745 -> a
+    398:398:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2753:2753 -> 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():2703:2703 -> a
+    399:399:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2711:2711 -> 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():2703 -> a
+    400:400:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2711 -> 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():2703:2747 -> a
+    401:445:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2711:2755 -> 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
@@ -36174,7 +36174,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():1513:1513 -> a
+    506:506:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1515:1515 -> 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
@@ -36210,10 +36210,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):2420:2420 -> 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 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):2420:2420 -> 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 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
@@ -36228,10 +36228,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):2420:2420 -> 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 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):2420:2420 -> 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 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
@@ -36252,17 +36252,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):2354:2354 -> a
+    661:661:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2362:2362 -> 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):2420:2420 -> 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 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):2420:2420 -> 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 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):2420:2420 -> 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 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
@@ -36271,10 +36271,10 @@
     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):2420:2420 -> 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 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):2420:2420 -> 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 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
@@ -36291,11 +36291,11 @@
     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):2420:2420 -> 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):2420:2420 -> 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
@@ -36306,7 +36306,7 @@
     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):2582:2582 -> 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
@@ -36315,46 +36315,46 @@
     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):2256:2266 -> 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):2266 -> 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):2266:2267 -> 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):2267 -> 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):2267:2267 -> 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):2267 -> 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):2267 -> 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):2267 -> 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):2267 -> 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):2268:2286 -> 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):2257:2257 -> 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):2248:2250 -> 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
@@ -36383,140 +36383,142 @@
     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:1115: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:2243 -> a
-    1073:1115: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
-    1116:1116:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2291:2291 -> a
-    1116:1116:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1108 -> a
-    1117:1117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2291:2291 -> a
-    1117:1117:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1109 -> a
-    1118:1118:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1110:1110 -> a
-    1119:1119: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):2346:2346 -> a
-    1119:1119:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1110 -> a
-    1120:1121:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1111:1112 -> a
-    1122:1122:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2420:2420 -> a
-    1122:1122:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1113 -> a
-    1123:1123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2291:2291 -> a
-    1123:1123:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1201 -> a
-    1124:1124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2291:2291 -> a
-    1124:1124:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1202 -> a
-    1125:1128:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1203:1206 -> a
-    1129:1129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2291:2291 -> a
-    1129:1129:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2113 -> a
-    1130:1130:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2114:2114 -> a
-    1131:1131: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):2346:2346 -> a
-    1131:1131:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2114 -> a
-    1132:1133:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2115:2116 -> a
-    1134:1134:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2420:2420 -> a
-    1134:1134:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2117 -> 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):2291:2291 -> a
-    1135:1135:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1780 -> a
-    1136:1136:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1781:1781 -> 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):2346:2346 -> a
-    1137:1137:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1781 -> a
-    1138:1139:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1782:1783 -> a
-    1140:1140:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2420:2420 -> a
-    1140:1140:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1784 -> a
-    1141:1144:com.android.tools.r8.ir.code.Value readIntLiteral(long):2311:2314 -> a
-    1145:1147: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):2321:2323 -> a
-    1148:1148:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2350:2350 -> a
-    1148:1148:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2123 -> a
-    1149:1153:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2124:2128 -> a
-    1154:1154:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531:531 -> a
-    1154:1154:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2128 -> a
-    1155:1155:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    1155:1155:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():531 -> a
-    1155:1155:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2128 -> a
-    1156:1166:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2129:2139 -> a
-    1167:1171:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2137:2141 -> a
-    1172:1172:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2350:2350 -> a
-    1172:1172: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):2328 -> a
-    1173:1173:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2354:2354 -> a
-    1173:1173: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):2329 -> a
-    1174:1175: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):2341:2342 -> a
-    1176:1176:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2354:2354 -> a
-    1176:1176:void addBooleanNonThisArgument(int):1010 -> a
-    1177:1178:void addBooleanNonThisArgument(int):1011:1012 -> a
-    1179:1179:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2354:2354 -> a
-    1179:1179:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1004 -> a
-    1180:1181:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1005:1006 -> a
-    1182:1182:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2424:2424 -> a
-    1183:1187:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2456:2460 -> a
-    1183:1187:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2424 -> a
-    1188:1188:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    1188:1188:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2460 -> a
-    1188:1188:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2424 -> a
-    1189:1189:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2460:2460 -> a
-    1189:1189:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2424 -> a
-    1190:1190:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2457:2457 -> a
-    1190:1190:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2424 -> a
-    1191:1216:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2425:2450 -> a
-    1217:1221:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2439:2443 -> a
-    1222:1228:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2441:2447 -> a
-    1229:1229:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2521:2521 -> a
-    1229:1229:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2514 -> a
-    1229:1229:void ensureSuccessorBlock(int,int,boolean):2550 -> a
-    1230:1232:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2515:2517 -> a
-    1230:1232:void ensureSuccessorBlock(int,int,boolean):2550 -> a
-    1233:1236:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2505:2508 -> a
-    1233:1236:void ensureSuccessorBlock(int,int,boolean):2551 -> a
-    1237:1237:void ensureSuccessorBlock(int,int,boolean):2552:2552 -> a
-    1238:1238:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):284:284 -> a
-    1238:1238:void ensureSuccessorBlock(int,int,boolean):2554 -> a
-    1239:1239:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):280:280 -> a
-    1239:1239:void ensureSuccessorBlock(int,int,boolean):2555 -> a
-    1240:1240:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):297:297 -> a
-    1240:1240:void ensureSuccessorBlock(int,int,boolean):2557 -> a
-    1241:1241:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):293:293 -> a
-    1241:1241:void ensureSuccessorBlock(int,int,boolean):2558 -> a
-    1242:1242:void ensureSuccessorBlock(int,int,boolean):2560:2560 -> a
-    1243:1243:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2582:2582 -> a
-    1243:1243:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1419 -> a
-    1244:1244:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2582:2582 -> a
-    1244:1244:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1420 -> a
-    1245:1250:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1421:1426 -> a
-    1251:1254:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2599:2602 -> a
-    1255:1255:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2601:2601 -> a
-    1256:1258:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2616:2618 -> a
-    1256:1258:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1259:1259:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2586:2586 -> a
-    1259:1259:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2578 -> a
-    1259:1259:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2618 -> a
-    1259:1259:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1260:1260:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2574:2574 -> a
-    1260:1260:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2578 -> a
-    1260:1260:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2618 -> a
-    1260:1260:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1261:1261:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2619:2619 -> a
-    1261:1261:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1262:1263:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():312:313 -> a
-    1262:1263:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2620 -> a
-    1262:1263:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1264:1264:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2623:2623 -> a
-    1264:1264:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1265:1265:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2574:2574 -> a
-    1265:1265:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2624 -> a
-    1265:1265:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1266:1266:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():301:301 -> a
-    1266:1266:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2625 -> a
-    1266:1266:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1267:1277:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2628:2638 -> a
-    1267:1277:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1278:1286:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2635:2643 -> a
-    1278:1286:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1287:1292: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):2659:2664 -> a
-    1287:1292:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2643 -> a
-    1287:1292:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1293:1300:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2644:2651 -> a
-    1293:1300:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1301:1303:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():305:307 -> a
-    1301:1303:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2654 -> a
-    1301:1303:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1304:1304:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2654:2654 -> a
-    1304:1304:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2603 -> a
-    1305:1305:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2420:2420 -> a
-    1305:1305:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2604 -> a
-    1306:1306:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2605:2605 -> a
-    1307:1307:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2753:2753 -> 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
     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
@@ -36534,61 +36536,61 @@
     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):2420:2420 -> 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 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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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 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):2582:2582 -> b
+    81:81:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2590:2590 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2295:2298 -> 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):2304:2307 -> 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):2299 -> 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):2420:2420 -> 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):2420:2420 -> b
-    131:131:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2582:2582 -> 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
     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):2757:2757 -> b
+    136:136:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2765:2765 -> 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):2291:2291 -> 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: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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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 addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1133 -> c
     10:10:void checkInvokeArgumentRegisters(int,int):1733:1733 -> c
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
@@ -36608,19 +36610,19 @@
     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):2420:2420 -> 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):2465:2480 -> c
+    35:50:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2473:2488 -> 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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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 addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1143 -> d
     10:14:void addMoveResult(int):1760:1764 -> d
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> d
@@ -36633,22 +36635,22 @@
     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):2420:2420 -> 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):2568:2568 -> d
-    30:31:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2590:2591 -> d
+    29:29:void ensureExceptionalSuccessorBlock(int,int):2576:2576 -> d
+    30:31:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2598:2599 -> 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():2592 -> d
-    33:35:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2593:2595 -> d
+    32:32:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2600 -> d
+    33:35:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2601:2603 -> 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):2291:2291 -> 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: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):2291:2291 -> 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: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):2346:2346 -> 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: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
@@ -36658,224 +36660,224 @@
     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):2564:2564 -> e
+    29:29:void ensureNormalSuccessorBlock(int,int):2572:2572 -> 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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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
     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):2291:2291 -> 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: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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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 addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1351 -> g
-    9:10:void checkRegister(int):2361:2362 -> g
+    9:10:void checkRegister(int):2369:2370 -> g
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
-    11:11:void checkRegister(int):2362 -> g
-    12:12:void checkRegister(int):2362:2362 -> g
-    13:13:void checkRegister(int):2359:2359 -> g
+    11:11:void checkRegister(int):2370 -> g
+    12:12:void checkRegister(int):2370:2370 -> g
+    13:13:void checkRegister(int):2367:2367 -> 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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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 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):2487:2488 -> h
-    12:12:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2521:2521 -> h
-    12:12:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2491 -> h
-    13:16:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2505:2508 -> h
-    13:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2492 -> h
-    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2493:2494 -> 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
     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):2494 -> h
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    21:22:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    23:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    33:34:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    35:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    41:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
+    42:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2502 -> 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):2494 -> h
-    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2496:2499 -> 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
     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):2291:2291 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2582:2582 -> i
+    10:10:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2590:2590 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2525:2526 -> j
-    12:13:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2543:2544 -> j
-    12:13:boolean isIndexProcessed(int):2528 -> j
-    14:14:boolean isIndexProcessed(int):2529:2529 -> 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
     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):2291:2291 -> 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: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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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 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):2291:2291 -> 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: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):2346:2346 -> 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: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):2420:2420 -> 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 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> r
+    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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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():2766:2772 -> toString
+    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):2291:2291 -> 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):2291:2291 -> 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):2346:2346 -> 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):2420:2420 -> 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):2291:2291 -> 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):2346:2346 -> 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):2346:2346 -> 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):2420:2420 -> 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.re$a:
 com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.re$b:
@@ -37085,7 +37087,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():1731:1731 -> a
+    377:377:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1733:1733 -> 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
@@ -37109,7 +37111,7 @@
     763:768:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1045:1050 -> 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():1739:1739 -> a
+    812:812:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1741:1741 -> 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
@@ -37148,7 +37150,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():1764:1764 -> a
+    944:944:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1766:1766 -> 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
@@ -37211,7 +37213,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():1715:1715 -> c
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1717:1717 -> 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
@@ -37237,7 +37239,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():1752:1752 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1754:1754 -> 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
@@ -38047,20 +38049,20 @@
     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:67:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):976:1042 -> e
-    1:18:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1114:1131 -> f
+    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):1050:1062 -> j
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():1920:1920 -> j
-    14:14:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1062 -> j
-    15:19:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1063:1067 -> j
-    20:44:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1061:1085 -> j
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():1920:1920 -> j
-    45:45:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1085 -> j
-    46:50:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1086:1090 -> j
-    51:72:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1084:1105 -> j
+    1:13:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1061:1073 -> j
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():1922:1922 -> 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():1922:1922 -> 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
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.Z1$g:
@@ -39952,7 +39954,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):1402:1402 -> a
+    221:221:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1404:1404 -> 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
@@ -41846,7 +41848,7 @@
     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
     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():1456:1456 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1458:1458 -> a
     57:57:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():488 -> 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
@@ -42787,7 +42789,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():1723:1723 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1725:1725 -> 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
@@ -43186,7 +43188,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():1509:1509 -> k
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1511:1511 -> 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
@@ -43209,7 +43211,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():1912:1912 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveSwitchMaxIntBug():1914:1914 -> 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
@@ -43242,7 +43244,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():1684:1684 -> o
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1686:1686 -> 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
@@ -43373,7 +43375,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():1656:1656 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1658:1658 -> 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
@@ -44282,7 +44284,7 @@
     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():1456:1456 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1458:1458 -> a
     3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():488 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41 -> a
     4:9:void removeNests():50:55 -> a
@@ -45688,114 +45690,114 @@
     388:388:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
     389:389:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):666:666 -> a
     389:389:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    390:401:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):734:745 -> a
-    390:401:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    390:401:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    402:402:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    402:402:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):749 -> a
-    402:402:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    402:402:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    403:405:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):750:752 -> a
-    403:405:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    403:405:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    406:407:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):778:779 -> a
-    406:407:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
-    406:407:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    406:407:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    408:408: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
-    408:408:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):779 -> a
-    408:408:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
-    408:408:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    408:408:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    409:426:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):780:797 -> a
-    409:426:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
-    409:426:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    409:426:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    427:427:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):792:792 -> a
-    427:427:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
-    427:427:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    427:427:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    428:428:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):787:787 -> a
-    428:428:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
-    428:428:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    428:428:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    429:429:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):782:782 -> a
-    429:429:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
-    429:429:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    429:429:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    430:442:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):754:766 -> a
-    430:442:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
-    430:442:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    443:444:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):669:670 -> a
-    443:444:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    445:445:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    445:445:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):670 -> a
-    445:445:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    446:446:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):670:670 -> a
-    446:446:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
-    447:471:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():811:835 -> a
-    447:471:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    472:474:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():829:831 -> a
-    472:474:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    475:477:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():813:815 -> a
-    475:477:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    478:478:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391:391 -> a
-    479:489:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):461:471 -> a
-    490:490:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    490:490:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):471 -> a
-    491:491:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    491:491:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):471 -> a
-    492:499:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):476:483 -> a
-    500:500:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
-    500:500:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):483 -> a
-    501:507:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):484:490 -> a
-    508:508:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):102:102 -> a
-    508:508:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):491 -> a
-    509:509:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):101:101 -> a
-    509:509:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):491 -> a
-    510:510:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):20:20 -> a
-    510:510:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):101 -> a
-    510:510:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):491 -> a
-    511:515:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):493:497 -> a
-    516:516:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):494:494 -> a
-    517:550:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):472:505 -> a
-    551:555:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):504:508 -> a
-    556:556:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):507:507 -> a
-    557:560:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set):675:678 -> a
-    561:561:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    561:561:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set):678 -> a
-    562:587:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set):679:704 -> a
-    588:588:int lambda$removeFieldReadsFromNewInstance$1(com.android.tools.r8.ir.code.InstanceGet):676:676 -> a
-    589:593:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):713:717 -> a
-    594:608:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):716:730 -> a
-    609:609:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$removeFieldReadFromNewInstance$2(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):717:717 -> a
-    610:620:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1106:1116 -> a
-    621:628:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1130:1137 -> a
-    629:629:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    629:629:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1137 -> a
-    630:637:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1137:1144 -> a
-    638:684:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.scheduleNewUsersForAnalysis(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):920:966 -> a
-    638:684:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1145 -> a
-    685:695:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1149:1159 -> a
-    696:699:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):973:976 -> a
-    696:699:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
-    700:728:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):999:1027 -> a
-    700:728:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):979 -> a
-    700:728:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
-    729:729:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    729:729:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1027 -> a
-    729:729:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):979 -> a
-    729:729:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
-    730:731:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1027:1028 -> a
-    730:731:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):979 -> a
-    730:731:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
-    732:742:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):985:995 -> a
-    732:742:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
-    743:747:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1176:1180 -> a
-    743:747:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1163 -> a
-    748:749:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1171:1172 -> a
-    750:750:void lambda$removeInstruction$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1218:1218 -> a
-    751:752:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1218:1219 -> a
+    390:405:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):734:749 -> a
+    390:405:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    390:405:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    406:406:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    406:406:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):749 -> a
+    406:406:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    406:406:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    407:409:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):750:752 -> a
+    407:409:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    407:409:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    410:411:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):778:779 -> a
+    410:411:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
+    410:411:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    410:411:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    412:412: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
+    412:412:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):779 -> a
+    412:412:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
+    412:412:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    412:412:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    413:430:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):780:797 -> a
+    413:430:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
+    413:430:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    413:430:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    431:431:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):792:792 -> a
+    431:431:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
+    431:431:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    431:431:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    432:432:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):787:787 -> a
+    432:432:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
+    432:432:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    432:432:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    433:433:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):782:782 -> a
+    433:433:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):751 -> a
+    433:433:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    433:433:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    434:446:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):754:766 -> a
+    434:446:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):667 -> a
+    434:446:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    447:448:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):669:670 -> a
+    447:448:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    449:449:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    449:449:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):670 -> a
+    449:449:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    450:450:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):670:670 -> a
+    450:450:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):389 -> a
+    451:475:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():811:835 -> a
+    451:475:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    476:478:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():829:831 -> a
+    476:478:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    479:481:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldWrites():813:815 -> a
+    479:481:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    482:482:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391:391 -> a
+    483:493:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):461:471 -> a
+    494:494:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    494:494:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):471 -> a
+    495:495:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    495:495:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):471 -> a
+    496:503:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):476:483 -> a
+    504:504:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):220:220 -> a
+    504:504:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):483 -> a
+    505:511:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):484:490 -> a
+    512:512:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):102:102 -> a
+    512:512:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):491 -> a
+    513:513:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):101:101 -> a
+    513:513:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):491 -> a
+    514:514:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexClassAndMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):20:20 -> a
+    514:514:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):101 -> a
+    514:514:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):491 -> a
+    515:519:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):493:497 -> a
+    520:520:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):494:494 -> a
+    521:554:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):472:505 -> a
+    555:559:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):504:508 -> a
+    560:560:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):507:507 -> a
+    561:564:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set):675:678 -> a
+    565:565:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    565:565:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set):678 -> a
+    566:591:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,java.util.Set):679:704 -> a
+    592:592:int lambda$removeFieldReadsFromNewInstance$1(com.android.tools.r8.ir.code.InstanceGet):676:676 -> a
+    593:597:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):713:717 -> a
+    598:612:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):716:730 -> a
+    613:613:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$removeFieldReadFromNewInstance$2(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):717:717 -> a
+    614:624:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1106:1116 -> a
+    625:632:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1130:1137 -> a
+    633:633:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    633:633:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1137 -> a
+    634:641:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1137:1144 -> a
+    642:688:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.scheduleNewUsersForAnalysis(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):920:966 -> a
+    642:688:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1145 -> a
+    689:699:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1149:1159 -> a
+    700:703:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):973:976 -> a
+    700:703:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
+    704:732:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):999:1027 -> a
+    704:732:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):979 -> a
+    704:732:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
+    733:733:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    733:733:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1027 -> a
+    733:733:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):979 -> a
+    733:733:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
+    734:735:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1027:1028 -> a
+    734:735:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):979 -> a
+    734:735:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
+    736:746:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):985:995 -> a
+    736:746:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1160 -> a
+    747:751:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1176:1180 -> a
+    747:751:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1163 -> a
+    752:753:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1171:1172 -> a
+    754:754:void lambda$removeInstruction$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1218:1218 -> a
+    755:756:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1218:1219 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():127:127 -> b
     2:2:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):801:801 -> b
     3:3:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():459:459 -> b
@@ -49901,14 +49903,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():1608:1608 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1610:1610 -> 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():1617:1617 -> a
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1619:1619 -> 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
@@ -50315,16 +50317,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():1623:1623 -> c
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1625:1625 -> 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():1656:1656 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1658:1658 -> 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():1830:1830 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1832:1832 -> 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
@@ -50335,12 +50337,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():1656:1656 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1658:1658 -> 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():1830:1830 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1832:1832 -> 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
@@ -50770,7 +50772,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():1592:1592 -> a
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1594:1594 -> 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
@@ -66867,96 +66869,104 @@
     com.android.tools.r8.utils.BiMapContainer nameMapping -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):38:38 -> <init>
-    2:2:void <init>(java.util.Map):132:132 -> <init>
-    3:10:void <init>(java.util.Map):130:137 -> <init>
-    11:11:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):140:140 -> <init>
-    12:23:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):130:141 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():68:68 -> a
-    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):77:77 -> a
-    3:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):82:88 -> a
-    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):72:72 -> a
-    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):88 -> a
-    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):110:110 -> a
-    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):72 -> a
-    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):88 -> a
-    12:12:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):98:98 -> a
-    13:13:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):110:110 -> a
-    13:13:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):97 -> a
-    14:14:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean):105:105 -> a
-    15:15:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean):104:104 -> a
-    16:25:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):116:116 -> a
-    33:33:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):124:124 -> a
-    34:37:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):158:161 -> a
-    38:38:java.lang.String deobfuscateType(java.lang.String):190:190 -> a
-    38:38:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):161 -> a
-    39:41:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):161:163 -> a
-    42:42:java.lang.String deobfuscateType(java.lang.String):190:190 -> a
-    42:42:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):163 -> a
-    43:43:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):165:165 -> a
-    44:48:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):149:153 -> a
-    44:48:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):167 -> a
-    49:49:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):167:167 -> a
-    50:50:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):171:171 -> a
-    51:51:java.lang.String deobfuscateType(java.lang.String):190:190 -> a
-    51:51:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):171 -> a
-    52:52:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):172:172 -> a
-    53:57:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):149:153 -> a
-    53:57:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):172 -> a
-    58:58:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):172:172 -> a
-    59:63:java.lang.String deobfuscateClassName(java.lang.String):182:186 -> a
-    64:64:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):215:215 -> a
-    65:65:void write(com.android.tools.r8.utils.ChainableStringConsumer):237:237 -> a
-    66:66:java.util.Map getClassNameMappings():145:145 -> a
-    66:66:boolean verifyIsSorted():222 -> a
-    66:66:void write(com.android.tools.r8.utils.ChainableStringConsumer):237 -> a
-    67:69:boolean verifyIsSorted():222:224 -> a
-    67:69:void write(com.android.tools.r8.utils.ChainableStringConsumer):237 -> a
-    70:70:java.util.Map getClassNameMappings():145:145 -> a
-    70:70:boolean verifyIsSorted():224 -> a
-    70:70:void write(com.android.tools.r8.utils.ChainableStringConsumer):237 -> a
-    71:76:boolean verifyIsSorted():224:229 -> a
-    71:76:void write(com.android.tools.r8.utils.ChainableStringConsumer):237 -> a
-    77:77:java.util.Map getClassNameMappings():145:145 -> a
-    77:77:void write(com.android.tools.r8.utils.ChainableStringConsumer):238 -> a
-    78:79:void write(com.android.tools.r8.utils.ChainableStringConsumer):238:239 -> a
-    80:87:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):274:281 -> a
-    88:97:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):286:295 -> a
-    98:98:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):327:327 -> a
-    99:99:java.lang.String deobfuscateType(java.lang.String):190:190 -> a
-    99:99:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):327 -> a
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):206:206 -> b
-    2:2:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():251:251 -> b
+    1:1:void <clinit>():44:44 -> <clinit>
+    1:1:void <init>(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):165:165 -> <init>
+    3:6:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):163:166 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():102:102 -> a
+    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):111:111 -> a
+    3:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):116:122 -> a
+    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):106:106 -> a
+    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):122 -> a
+    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):144:144 -> a
+    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):106 -> a
+    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):122 -> a
+    12:12:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):132:132 -> a
+    13:13:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):144:144 -> a
+    13:13:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):131 -> a
+    14:14:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean):139:139 -> a
+    15:15:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean):138:138 -> a
+    16:25:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):150:150 -> a
+    33:33:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):158:158 -> a
+    34:37:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):183:186 -> a
+    38:38:java.lang.String deobfuscateType(java.lang.String):215:215 -> a
+    38:38:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):186 -> a
+    39:41:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):186:188 -> a
+    42:42:java.lang.String deobfuscateType(java.lang.String):215:215 -> a
+    42:42:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):188 -> a
+    43:43:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):190:190 -> a
+    44:48:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):174:178 -> a
+    44:48:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):192 -> a
+    49:49:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):192:192 -> a
+    50:50:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):196:196 -> a
+    51:51:java.lang.String deobfuscateType(java.lang.String):215:215 -> a
+    51:51:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):196 -> a
+    52:52:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):197:197 -> a
+    53:57:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):174:178 -> a
+    53:57:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):197 -> a
+    58:58:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):197:197 -> a
+    59:63:java.lang.String deobfuscateClassName(java.lang.String):207:211 -> a
+    64:64:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):240:240 -> a
+    65:65:void write(com.android.tools.r8.utils.ChainableStringConsumer):262:262 -> a
+    66:66:java.util.Map getClassNameMappings():170:170 -> a
+    66:66:boolean verifyIsSorted():247 -> a
+    66:66:void write(com.android.tools.r8.utils.ChainableStringConsumer):262 -> a
+    67:69:boolean verifyIsSorted():247:249 -> a
+    67:69:void write(com.android.tools.r8.utils.ChainableStringConsumer):262 -> a
+    70:70:java.util.Map getClassNameMappings():170:170 -> a
+    70:70:boolean verifyIsSorted():249 -> a
+    70:70:void write(com.android.tools.r8.utils.ChainableStringConsumer):262 -> a
+    71:76:boolean verifyIsSorted():249:254 -> a
+    71:76:void write(com.android.tools.r8.utils.ChainableStringConsumer):262 -> a
+    77:77:java.util.Map getClassNameMappings():170:170 -> a
+    77:77:void write(com.android.tools.r8.utils.ChainableStringConsumer):263 -> a
+    78:79:void write(com.android.tools.r8.utils.ChainableStringConsumer):263:264 -> a
+    80:87:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):299:306 -> a
+    88:97:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):311:320 -> a
+    98:98:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):352:352 -> a
+    99:99:java.lang.String deobfuscateType(java.lang.String):215:215 -> a
+    99:99:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):352 -> a
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):231:231 -> b
+    2:2:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():276:276 -> 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():252 -> b
-    4:10:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():253:259 -> b
-    11:21:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):299:309 -> b
-    22:32:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):313:323 -> b
-    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):92:92 -> c
-    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):110:110 -> c
-    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):92 -> c
-    3:3:boolean isEmpty():210:210 -> c
-    1:4:com.android.tools.r8.naming.ClassNameMapper sorted():214:217 -> d
-    1:2:boolean equals(java.lang.Object):264:265 -> equals
-    1:1:int hashCode():270:270 -> hashCode
-    1:3:java.lang.String toString():245:247 -> toString
+    3:3:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():277 -> b
+    4:10:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():278:284 -> b
+    11:21:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):324:334 -> b
+    22:32:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):338:348 -> b
+    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):126:126 -> c
+    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):144:144 -> c
+    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):126 -> c
+    3:3:boolean isEmpty():235:235 -> c
+    1:4:com.android.tools.r8.naming.ClassNameMapper sorted():239:242 -> d
+    1:2:boolean equals(java.lang.Object):289:290 -> equals
+    1:1:int hashCode():295:295 -> hashCode
+    1:3:java.lang.String toString():270:272 -> 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:
-    com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder mapBuilder -> a
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper$1):45:45 -> <init>
-    2:3:void <init>():48:49 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):45:45 -> a
-    2:2:com.android.tools.r8.naming.ClassNameMapper build():63:63 -> a
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):56:56 -> b
-    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder com.android.tools.r8.naming.ClassNamingForNameMapper.builder(java.lang.String,java.lang.String):234:234 -> b
-    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):56 -> b
-    3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):57:57 -> 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:2:void addScopedMappingInformation(com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation):70:70 -> a
+    3:3:void lambda$addScopedMappingInformation$0(java.lang.String,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation):72:72 -> a
+    4:4:com.android.tools.r8.naming.ClassNameMapper build():77:77 -> a
+    5:5:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder lambda$buildClassNameMappings$1(java.lang.String):84:84 -> a
+    6:6:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder com.android.tools.r8.naming.ClassNamingForNameMapper.builder(java.lang.String,java.lang.String):227:227 -> a
+    6:6:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder lambda$buildClassNameMappings$1(java.lang.String):84 -> a
+    7:7:java.lang.String lambda$buildClassNameMappings$2(com.android.tools.r8.naming.ClassNamingForNameMapper):88:88 -> a
+    8:12:void lambda$buildClassNameMappings$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):91:95 -> 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):227:227 -> 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:19:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():82:97 -> 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>():41:42 -> <clinit>
-    1:1:void <init>(java.lang.String,int):40:40 -> <init>
+    1:2:void <clinit>():47:48 -> <clinit>
+    1:1:void <init>(java.lang.String,int):46:46 -> <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
@@ -67074,67 +67084,70 @@
     void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
     com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation) -> a
     com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.DiagnosticsHandler,int) -> a
-    1:8:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):60:67 -> a
-    9:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):66:66 -> a
-    10:19:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):65:74 -> a
-    20:20:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):73:73 -> a
-    21:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):72:72 -> a
-    22:22:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):63:63 -> a
+    1:1:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):63:63 -> a
+    2:2:boolean com.android.tools.r8.naming.MemberNaming.isMethodNaming():87:87 -> a
+    2:2:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):60 -> a
+    3:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):61:67 -> a
+    10:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):66:66 -> a
+    11:20:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):65:74 -> a
+    21:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):73:73 -> a
+    22:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):72:72 -> a
     23:23:com.android.tools.r8.naming.ClassNamingForMapApplier build():97:97 -> 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
+    com.android.tools.r8.com.google.common.collect.ImmutableList additionalMappings -> g
     boolean $assertionsDisabled -> h
     java.util.Map mappedRangesByRenamedName -> e
     java.lang.String renamedName -> b
     java.util.Map mappedFieldNamingsByName -> f
-    java.util.Map additionalMappings -> g
-    1:1:void <clinit>():34:34 -> <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.Map,com.android.tools.r8.naming.ClassNamingForNameMapper$1):34:34 -> <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.Map):263:270 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName getMappedRangesForRenamedName(java.lang.String):274:274 -> a
-    2:8:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):279:285 -> a
-    9:9:java.util.Collection allFieldNamings():340:340 -> a
-    10:22:void write(com.android.tools.r8.utils.ChainableStringConsumer):356:368 -> a
-    23:24:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):334:335 -> a
-    23:24:void write(com.android.tools.r8.utils.ChainableStringConsumer):368 -> a
-    25:31:void write(com.android.tools.r8.utils.ChainableStringConsumer):372:378 -> a
-    32:34:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming$Signature,java.util.List):361:363 -> a
-    35:35:void lambda$write$1(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming):368:368 -> a
-    36:36:int lambda$write$2(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):376:376 -> a
-    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):291:301 -> b
-    12:20:java.util.List lookupByOriginalName(java.lang.String):310:318 -> b
-    21:21:java.util.Collection allMethodNamings():352:352 -> b
-    1:1:java.util.Map getAdditionalMappings():383:383 -> c
-    1:11:boolean equals(java.lang.Object):398:408 -> equals
-    1:5:int hashCode():413:417 -> hashCode
-    1:3:java.lang.String toString():388:390 -> toString
+    1:1:void <clinit>():33:33 -> <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.com.google.common.collect.ImmutableList,com.android.tools.r8.naming.ClassNamingForNameMapper$1):33:33 -> <init>
+    2:10:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableList):256:264 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName getMappedRangesForRenamedName(java.lang.String):268:268 -> a
+    2:8:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):273:279 -> a
+    9:9:java.util.Collection allFieldNamings():334:334 -> a
+    10:16:void write(com.android.tools.r8.utils.ChainableStringConsumer):350:356 -> a
+    17:18:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):328:329 -> a
+    17:18:void write(com.android.tools.r8.utils.ChainableStringConsumer):356 -> a
+    19:25:void write(com.android.tools.r8.utils.ChainableStringConsumer):360:366 -> a
+    26:26:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):353:353 -> a
+    27:27:void lambda$write$1(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming):356:356 -> a
+    28:28:int lambda$write$2(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):364:364 -> a
+    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):285:295 -> b
+    12:20:java.util.List lookupByOriginalName(java.lang.String):304:312 -> b
+    21:21:java.util.Collection allMethodNamings():346:346 -> b
+    1:1:java.util.List getAdditionalMappings():371:371 -> c
+    1:11:boolean equals(java.lang.Object):386:396 -> equals
+    1:5:int hashCode():401:405 -> hashCode
+    1:3:java.lang.String toString():376:378 -> 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 additionalMappings -> g
     boolean $assertionsDisabled -> h
     java.util.Map mappedRangesByName -> e
     java.lang.String renamedName -> b
     java.util.Map mappedFieldNamingsByName -> f
-    java.util.Map additionalMappings -> g
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):36:36 -> <init>
-    2:2:void <init>(java.lang.String,java.lang.String):46:46 -> <init>
-    3:11:void <init>(java.lang.String,java.lang.String):40:48 -> <init>
-    1:7:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):53:59 -> a
-    8:8:com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation):66:66 -> a
-    9:9:com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.DiagnosticsHandler,int):78:78 -> a
-    10:12:void lambda$addMappingInformation$2(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.naming.mappinginformation.MappingInformation,int,com.android.tools.r8.naming.mappinginformation.MappingInformation):81:81 -> a
-    13:23:com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):89:99 -> a
-    24:24:java.util.List lambda$addMappingInformation$3(com.android.tools.r8.naming.MemberNaming$Signature):93:93 -> a
-    25:34:com.android.tools.r8.naming.ClassNamingForNameMapper build():107:116 -> a
-    35:37:void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):133:135 -> a
-    38:38:java.util.List lambda$addMappedRange$4(java.lang.String):134:134 -> a
-    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):58:58 -> b
-    2:2:void lambda$addMappingInformation$1(com.android.tools.r8.naming.mappinginformation.MappingInformation):69:69 -> b
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):35:35 -> <init>
+    2:2:void <init>(java.lang.String,java.lang.String):45:45 -> <init>
+    3:11:void <init>(java.lang.String,java.lang.String):39:47 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation):65:65 -> a
+    2:2:com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.DiagnosticsHandler,int):77:77 -> a
+    3:5:void lambda$addMappingInformation$2(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.naming.mappinginformation.MappingInformation,int,com.android.tools.r8.naming.mappinginformation.MappingInformation):80:80 -> a
+    6:11:com.android.tools.r8.naming.ClassNaming$Builder addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):87:92 -> a
+    12:12:boolean com.android.tools.r8.naming.MemberNaming.isMethodNaming():87:87 -> a
+    12:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):52 -> a
+    13:18:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):53:58 -> a
+    19:35:com.android.tools.r8.naming.ClassNamingForNameMapper build():100:116 -> a
+    36:38:void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):126:128 -> a
+    39:39:java.util.List lambda$addMappedRange$3(java.lang.String):127:127 -> a
+    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):57:57 -> b
+    2:2:void lambda$addMappingInformation$1(com.android.tools.r8.naming.mappinginformation.MappingInformation):68:68 -> b
 com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange -> com.android.tools.r8.naming.g$c:
     com.android.tools.r8.naming.Range minifiedRange -> a
     int nextSequenceNumber -> f
@@ -67143,26 +67156,26 @@
     int sequenceNumber -> e
     com.android.tools.r8.naming.MemberNaming$MethodSignature signature -> b
     java.lang.String renamedName -> d
-    1:3:void <clinit>():439:441 -> <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):439:439 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):459:459 -> <init>
-    3:15:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):456:468 -> <init>
-    1:1:int access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):439:439 -> a
-    2:2:int getNextSequenceNumber():444:444 -> a
-    3:22:int getOriginalLineNumber(int):472:491 -> a
-    1:10:boolean equals(java.lang.Object):526:535 -> equals
-    1:4:int hashCode():541:544 -> hashCode
-    1:10:java.lang.String toString():507:516 -> toString
+    1:3:void <clinit>():427:429 -> <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):427:427 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):447:447 -> <init>
+    3:15:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String):444:456 -> <init>
+    1:1:int access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):427:427 -> a
+    2:2:int getNextSequenceNumber():432:432 -> a
+    3:22:int getOriginalLineNumber(int):460:479 -> a
+    1:10:boolean equals(java.lang.Object):514:523 -> equals
+    1:4:int hashCode():529:532 -> hashCode
+    1:10:java.lang.String toString():495:504 -> 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):143:144 -> <init>
-    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):140:140 -> a
-    2:2:java.util.List allRangesForLine(int):174:174 -> a
-    3:22:java.util.List allRangesForLine(int,boolean):187:206 -> a
-    23:23:java.util.List getMappedRanges():210:210 -> a
-    1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):153:160 -> b
-    1:7:boolean equals(java.lang.Object):218:224 -> equals
-    1:1:int hashCode():229:229 -> hashCode
+    1:2:void <init>(java.util.List):136:137 -> <init>
+    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):133:133 -> a
+    2:2:java.util.List allRangesForLine(int):167:167 -> a
+    3:22:java.util.List allRangesForLine(int,boolean):180:199 -> a
+    23:23:java.util.List getMappedRanges():203:203 -> a
+    1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):146:153 -> b
+    1:7:boolean equals(java.lang.Object):211:217 -> equals
+    1:1:int hashCode():222:222 -> hashCode
 com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.naming.h:
     java.nio.file.Path path -> b
     java.io.BufferedReader reader -> a
@@ -67626,7 +67639,22 @@
     int incrementNameIndex() -> a
     int getDictionaryIndex() -> b
     int incrementDictionaryIndex() -> c
-com.android.tools.r8.naming.MemberNaming -> com.android.tools.r8.naming.v:
+com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.naming.v:
+    com.android.tools.r8.naming.MapVersion[] $VALUES -> d
+    java.lang.String name -> a
+    com.android.tools.r8.naming.MapVersion MapVersionExperimental -> c
+    com.android.tools.r8.naming.MapVersion MapVersionNone -> b
+    1:2:void <clinit>():9:10 -> <clinit>
+    3:3:void <clinit>():8:8 -> <clinit>
+    1:2:void <init>(java.lang.String,int,java.lang.String):16:17 -> <init>
+    1:1:com.android.tools.r8.naming.MapVersion[] values():8:8 -> a
+    1:1:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):25 -> a
+    2:2:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):25:25 -> a
+    3:3:java.lang.String getName():21:21 -> a
+    3:3:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):26 -> a
+    4:4:com.android.tools.r8.naming.MapVersion fromName(java.lang.String):26:26 -> a
+    5:5:java.lang.String getName():21:21 -> a
+com.android.tools.r8.naming.MemberNaming -> com.android.tools.r8.naming.w:
     com.android.tools.r8.naming.MemberNaming$Signature signature -> a
     com.android.tools.r8.naming.MemberNaming$Signature renamedSignature -> b
     com.android.tools.r8.position.Position position -> c
@@ -67635,56 +67663,48 @@
     1:1:com.android.tools.r8.naming.MemberNaming$Signature getOriginalSignature():71:71 -> a
     1:1:java.lang.String getRenamedName():83:83 -> b
     1:1:com.android.tools.r8.naming.MemberNaming$Signature getRenamedSignature():79:79 -> c
-    1:1:boolean isMethodNaming():87:87 -> d
     1:6:boolean equals(java.lang.Object):38:43 -> equals
     1:2:int hashCode():48:49 -> hashCode
     1:1:java.lang.String toString():100:100 -> toString
-com.android.tools.r8.naming.MemberNaming$FieldSignature -> com.android.tools.r8.naming.v$a:
+com.android.tools.r8.naming.MemberNaming$FieldSignature -> com.android.tools.r8.naming.w$a:
     java.lang.String type -> c
-    1:2:void <init>(java.lang.String,java.lang.String):210:211 -> <init>
+    1:2:void <init>(java.lang.String,java.lang.String):176:177 -> <init>
     com.android.tools.r8.naming.MemberNaming$FieldSignature asFieldSignature() -> a
-    1:1:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField):215:215 -> a
-    2:2:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):219:219 -> a
+    1:1:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField):181:181 -> a
+    2:2:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):185:185 -> a
     3:3:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():182:182 -> a
-    3:3:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):220 -> a
-    4:5:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):220:221 -> a
-    6:10:com.android.tools.r8.graph.DexField toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):225:225 -> a
-    11:11:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):233:233 -> a
-    12:14:void write(java.io.Writer):265:267 -> a
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():238:238 -> d
-    1:5:boolean equals(java.lang.Object):246:250 -> equals
-    1:1:int hashCode():255:255 -> hashCode
-    1:1:java.lang.String toString():260:260 -> toString
-com.android.tools.r8.naming.MemberNaming$MethodSignature -> com.android.tools.r8.naming.v$b:
+    3:3:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    4:5:com.android.tools.r8.naming.MemberNaming$FieldSignature fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
+    6:10:com.android.tools.r8.graph.DexField toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):191:191 -> a
+    11:11:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):199:199 -> a
+    12:14:void write(java.io.Writer):231:233 -> a
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():204:204 -> d
+    1:5:boolean equals(java.lang.Object):212:216 -> equals
+    1:1:int hashCode():221:221 -> hashCode
+    1:1:java.lang.String toString():226:226 -> toString
+com.android.tools.r8.naming.MemberNaming$MethodSignature -> com.android.tools.r8.naming.w$b:
     boolean $assertionsDisabled -> e
     java.lang.String[] parameters -> d
     java.lang.String type -> c
-    1:1:void <clinit>():281:281 -> <clinit>
-    1:3:void <init>(java.lang.String,java.lang.String,java.lang.String[]):287:289 -> <init>
-    4:6:void <init>(java.lang.String,java.lang.String,java.util.Collection):293:295 -> <init>
-    1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod):299:299 -> a
-    2:9:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):303:310 -> a
-    10:19:com.android.tools.r8.naming.MemberNaming$MethodSignature fromSignature(java.lang.String,java.lang.String):315:324 -> a
-    20:28:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):334:342 -> a
-    29:29:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):339:339 -> a
-    30:30:com.android.tools.r8.naming.MemberNaming$MethodSignature initializer(java.lang.String[]):346:346 -> a
-    31:31:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):351:351 -> a
-    32:42:void write(java.io.Writer):388:398 -> a
+    1:1:void <clinit>():247:247 -> <clinit>
+    1:3:void <init>(java.lang.String,java.lang.String,java.lang.String[]):253:255 -> <init>
+    4:6:void <init>(java.lang.String,java.lang.String,java.util.Collection):259:261 -> <init>
+    1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod):265:265 -> a
+    2:9:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):269:276 -> a
+    10:19:com.android.tools.r8.naming.MemberNaming$MethodSignature fromSignature(java.lang.String,java.lang.String):281:290 -> a
+    20:28:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):300:308 -> a
+    29:29:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):305:305 -> a
+    30:30:com.android.tools.r8.naming.MemberNaming$MethodSignature initializer(java.lang.String[]):312:312 -> a
+    31:31:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):317:317 -> a
+    32:42:void write(java.io.Writer):354:364 -> a
     com.android.tools.r8.naming.MemberNaming$MethodSignature asMethodSignature() -> b
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():356:356 -> d
-    1:8:boolean equals(java.lang.Object):364:371 -> equals
-    1:8:java.lang.String toDescriptor():402:409 -> g
-    1:2:com.android.tools.r8.naming.MemberNaming$MethodSignature toUnqualified():329:330 -> h
-    1:3:int hashCode():376:378 -> hashCode
-    1:1:java.lang.String toString():383:383 -> toString
-com.android.tools.r8.naming.MemberNaming$NoSignature -> com.android.tools.r8.naming.v$c:
-    com.android.tools.r8.naming.MemberNaming$NoSignature NO_SIGNATURE -> c
-    1:1:void <clinit>():173:173 -> <clinit>
-    1:1:void <init>():176:176 -> <init>
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):181:181 -> a
-    2:2:void write(java.io.Writer):201:201 -> a
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():186:186 -> d
-com.android.tools.r8.naming.MemberNaming$Signature -> com.android.tools.r8.naming.v$d:
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():322:322 -> d
+    1:8:boolean equals(java.lang.Object):330:337 -> equals
+    1:8:java.lang.String toDescriptor():368:375 -> g
+    1:2:com.android.tools.r8.naming.MemberNaming$MethodSignature toUnqualified():295:296 -> h
+    1:3:int hashCode():342:344 -> hashCode
+    1:1:java.lang.String toString():349:349 -> toString
+com.android.tools.r8.naming.MemberNaming$Signature -> com.android.tools.r8.naming.w$c:
     java.lang.String name -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():103:103 -> <clinit>
@@ -67698,18 +67718,18 @@
     1:2:java.lang.String toHolderFromQualified():133:134 -> e
     1:2:java.lang.String toUnqualifiedName():128:129 -> f
     1:6:java.lang.String toString():156:161 -> toString
-com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind -> com.android.tools.r8.naming.v$d$a:
+com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind -> com.android.tools.r8.naming.w$c$a:
     com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind FIELD -> b
     com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind METHOD -> a
     1:2:void <clinit>():166:167 -> <clinit>
     1:1:void <init>(java.lang.String,int):165:165 -> <init>
-com.android.tools.r8.naming.MemberNamingStrategy -> com.android.tools.r8.naming.w:
+com.android.tools.r8.naming.MemberNamingStrategy -> com.android.tools.r8.naming.x:
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate) -> a
     com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate) -> a
-com.android.tools.r8.naming.MethodNameMinifier -> com.android.tools.r8.naming.y:
+com.android.tools.r8.naming.MethodNameMinifier -> com.android.tools.r8.naming.z:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> e
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map renaming -> d
@@ -67756,17 +67776,17 @@
     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
-com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.naming.x:
-com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.y$a:
+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
-com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.naming.z:
+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
-com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.C:
+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
     boolean $assertionsDisabled -> f
@@ -67788,8 +67808,8 @@
     1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> c
     1:2:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):111 -> c
     3:8:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):111:116 -> c
-com.android.tools.r8.naming.MethodNamingState$1 -> com.android.tools.r8.naming.A:
-com.android.tools.r8.naming.MethodNamingState$InternalNewNameState -> com.android.tools.r8.naming.B:
+com.android.tools.r8.naming.MethodNamingState$1 -> com.android.tools.r8.naming.B:
+com.android.tools.r8.naming.MethodNamingState$InternalNewNameState -> com.android.tools.r8.naming.C:
     java.util.Map originalToRenamedNames -> b
     java.util.Map usedBy -> c
     com.android.tools.r8.naming.MethodNamingState$InternalNewNameState parentInternalState -> a
@@ -67810,14 +67830,14 @@
     1:1:int getDictionaryIndex():154:154 -> b
     2:2:java.util.Set lambda$addRenaming$0(com.android.tools.r8.graph.DexString):173:173 -> b
     1:1:int incrementDictionaryIndex():159:159 -> c
-com.android.tools.r8.naming.MethodNamingStateBase -> com.android.tools.r8.naming.D:
+com.android.tools.r8.naming.MethodNamingStateBase -> com.android.tools.r8.naming.E:
     java.util.Map internalStates -> a
     java.util.function.Function keyTransform -> b
     1:3:void <init>(java.util.function.Function):17:19 -> <init>
     java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod) -> a
     1:1:java.lang.Object lambda$getOrCreateInternalState$0(com.android.tools.r8.graph.DexMethod,java.lang.Object):29:29 -> a
     1:2:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexMethod):28:29 -> b
-com.android.tools.r8.naming.MethodReservationState -> com.android.tools.r8.naming.F:
+com.android.tools.r8.naming.MethodReservationState -> com.android.tools.r8.naming.G:
     com.android.tools.r8.naming.MethodReservationState parentNamingState -> c
     1:2:void <init>(com.android.tools.r8.naming.MethodReservationState,java.util.function.Function):27:28 -> <init>
     1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> a
@@ -67831,7 +67851,7 @@
     1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> c
     1:2:java.util.Set getReservedNamesFor(com.android.tools.r8.graph.DexMethod):64 -> c
     3:9:java.util.Set getReservedNamesFor(com.android.tools.r8.graph.DexMethod):64:70 -> c
-com.android.tools.r8.naming.MethodReservationState$InternalReservationState -> com.android.tools.r8.naming.E:
+com.android.tools.r8.naming.MethodReservationState$InternalReservationState -> com.android.tools.r8.naming.F:
     java.util.Map originalToReservedNames -> a
     java.util.Set reservedNames -> b
     boolean $assertionsDisabled -> c
@@ -67841,7 +67861,7 @@
     2:5:java.util.Set getAssignedNamesFor(com.android.tools.r8.graph.DexMethod):89:92 -> a
     6:14:void reserveName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):96:104 -> a
     15:15:java.util.Set lambda$reserveName$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):103:103 -> a
-com.android.tools.r8.naming.MinifiedRenaming -> com.android.tools.r8.naming.G:
+com.android.tools.r8.naming.MinifiedRenaming -> com.android.tools.r8.naming.H:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> h
     java.util.Map packageRenaming -> f
@@ -67863,7 +67883,7 @@
     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
-com.android.tools.r8.naming.Minifier -> com.android.tools.r8.naming.H:
+com.android.tools.r8.naming.Minifier -> com.android.tools.r8.naming.I:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -67876,7 +67896,7 @@
     45:45:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReachableInterface(java.util.function.Consumer):666:666 -> a
     45:45:java.util.List computeReachableInterfacesWithDeterministicOrder():94 -> a
     46:46:java.util.List computeReachableInterfacesWithDeterministicOrder():95:95 -> a
-com.android.tools.r8.naming.Minifier$BaseMinificationNamingStrategy -> com.android.tools.r8.naming.H$a:
+com.android.tools.r8.naming.Minifier$BaseMinificationNamingStrategy -> com.android.tools.r8.naming.I$a:
     java.util.List obfuscationDictionary -> a
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing mixedCasing -> c
     java.util.Set obfuscationDictionaryForLookup -> b
@@ -67884,7 +67904,7 @@
     1:1:void <clinit>():98:98 -> <clinit>
     1:6:void <init>(java.util.List,boolean):106:111 -> <init>
     1:15:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState):116:130 -> a
-com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> com.android.tools.r8.naming.H$b:
+com.android.tools.r8.naming.Minifier$MinificationClassNamingStrategy -> com.android.tools.r8.naming.I$b:
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.graph.AppView appView -> e
     1:2:void <init>(com.android.tools.r8.graph.AppView):142:143 -> <init>
@@ -67896,20 +67916,20 @@
     24:24:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):160 -> a
     25:25:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):160:160 -> a
     1:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):176:177 -> b
-com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> com.android.tools.r8.naming.H$c:
+com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy -> com.android.tools.r8.naming.I$c:
     com.android.tools.r8.naming.InternalNamingState namingState -> e
     1:2:void <init>(com.android.tools.r8.graph.AppView):214:215 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView):213:213 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView):190:190 -> <init>
     1:2:java.lang.String next(java.lang.String,java.util.function.Predicate):225:226 -> a
-com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy$1 -> com.android.tools.r8.naming.I:
+com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy$1 -> com.android.tools.r8.naming.J:
     int nameIndex -> b
     int dictionaryIndex -> a
     1:4:void <init>(com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy):191:194 -> <init>
     1:1:int incrementNameIndex():208:208 -> a
     1:1:int getDictionaryIndex():198:198 -> b
     1:1:int incrementDictionaryIndex():203:203 -> c
-com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> com.android.tools.r8.naming.H$d:
+com.android.tools.r8.naming.Minifier$MinifierMemberNamingStrategy -> com.android.tools.r8.naming.I$d:
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean desugaredLibraryRenaming -> g
@@ -67933,7 +67953,7 @@
     24:26:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):295:297 -> a
     27:27:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):304:304 -> a
     1:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):308:309 -> c
-com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.J:
+com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.K:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>():39:39 -> <init>
@@ -67972,8 +67992,8 @@
     1:1:boolean isIdentityLens():141:141 -> b
     1:2:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):145:146 -> c
     com.android.tools.r8.graph.DexString prefixRewrittenType(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.naming.NamingLens$1 -> com.android.tools.r8.naming.J$a:
-com.android.tools.r8.naming.NamingLens$IdentityLens -> com.android.tools.r8.naming.J$b:
+com.android.tools.r8.naming.NamingLens$1 -> com.android.tools.r8.naming.K$a:
+com.android.tools.r8.naming.NamingLens$IdentityLens -> com.android.tools.r8.naming.K$b:
     1:1:void <init>(com.android.tools.r8.naming.NamingLens$1):221:221 -> <init>
     2:2:void <init>():223:223 -> <init>
     com.android.tools.r8.graph.DexString lookupDescriptorForJavaTypeName(java.lang.String) -> a
@@ -67984,7 +68004,7 @@
     java.lang.String lookupPackageName(java.lang.String) -> b
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):229:229 -> b
-com.android.tools.r8.naming.NamingLens$NonIdentityNamingLens -> com.android.tools.r8.naming.J$c:
+com.android.tools.r8.naming.NamingLens$NonIdentityNamingLens -> com.android.tools.r8.naming.K$c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map typeStringMapping -> c
     boolean $assertionsDisabled -> d
@@ -67997,7 +68017,7 @@
     10:11:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):212 -> b
     12:12:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):204:204 -> b
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():198:198 -> c
-com.android.tools.r8.naming.PrefixRewritingNamingLens -> com.android.tools.r8.naming.K:
+com.android.tools.r8.naming.PrefixRewritingNamingLens -> com.android.tools.r8.naming.L:
     int $r8$clinit -> h
     com.android.tools.r8.graph.AppView appView -> f
     boolean $assertionsDisabled -> g
@@ -68020,15 +68040,16 @@
     2:2:com.android.tools.r8.graph.DexString getRenaming(com.android.tools.r8.graph.DexType):49 -> e
     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.L:
-    1:1:void <init>():11:11 -> <init>
+com.android.tools.r8.naming.ProguardMap$Builder -> com.android.tools.r8.naming.M:
+    1:1:void <init>():12:12 -> <init>
+    void addScopedMappingInformation(com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation) -> a
     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.M:
+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>
     1:1:com.android.tools.r8.naming.ProguardMapError duplicateSourceClass(java.lang.String,com.android.tools.r8.position.Position):21:21 -> a
     2:3:com.android.tools.r8.naming.ProguardMapError duplicateSourceMember(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):26:27 -> a
     4:5:com.android.tools.r8.naming.ProguardMapError duplicateTargetClass(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.Position):32:33 -> a
-com.android.tools.r8.naming.ProguardMapMinifier -> com.android.tools.r8.naming.Q:
+com.android.tools.r8.naming.ProguardMapMinifier -> com.android.tools.r8.naming.S:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.SeedMapper seedMapper -> c
@@ -68119,7 +68140,7 @@
     266:269:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):306:309 -> a
     1:1:void lambda$computeMapping$2(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):194:194 -> b
     2:2:void lambda$computeMapping$4(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):255:255 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.N:
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.O:
     java.util.Set mappedNames -> h
     boolean $assertionsDisabled -> i
     java.util.Map mappings -> g
@@ -68129,7 +68150,7 @@
     4:7:boolean lambda$next$0(java.util.function.Predicate,java.lang.String):404:407 -> a
     8:8:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):435:435 -> a
     1:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):416:430 -> b
-com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.O:
+com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.P:
     boolean $assertionsDisabled -> k
     java.util.Map mappedNames -> i
     com.android.tools.r8.graph.DexItemFactory factory -> j
@@ -68155,7 +68176,7 @@
     41:56:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):511:526 -> a
     57:63:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):537:543 -> a
     64:64:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):540:540 -> a
-com.android.tools.r8.naming.ProguardMapMinifier$ProguardMapMinifiedRenaming -> com.android.tools.r8.naming.P:
+com.android.tools.r8.naming.ProguardMapMinifier$ProguardMapMinifiedRenaming -> com.android.tools.r8.naming.Q:
     java.util.Set unmappedReferences -> i
     java.util.Map classRenamingsMappingToDifferentName -> j
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming,java.util.Set):560:563 -> <init>
@@ -68167,150 +68188,163 @@
     15:19:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):586:590 -> a
     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.T:
+com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.U:
     java.lang.String line -> g
-    java.util.HashMap cache -> h
+    java.util.HashMap cache -> j
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
-    boolean $assertionsDisabled -> i
+    com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference implicitSingletonScope -> i
     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
     boolean allowEmptyMappedRanges -> d
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):76:76 -> <init>
-    2:337:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):64:399 -> <init>
-    338:342:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):77:81 -> <init>
-    1:1:int access$000(com.android.tools.r8.naming.ProguardMapReader):61:61 -> a
-    2:3:char peekChar(int):94:95 -> a
-    4:8:boolean isEmptyOrCommentLine(java.lang.String):133:137 -> a
-    9:13:boolean hasFirstCharJsonBrace(java.lang.String,int):160:164 -> a
-    14:18:void expect(char):203:207 -> a
-    19:19:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> a
-    19:19:void expect(char):207 -> a
-    20:20:void expect(char):207:207 -> a
-    21:21:void expect(char):204:204 -> a
-    22:24:void parse(com.android.tools.r8.naming.ProguardMap$Builder):214:216 -> a
-    25:39:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):223:237 -> a
-    25:39:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    40:45:boolean acceptString(java.lang.String):484:489 -> a
-    40:45:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):237 -> a
-    40:45:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    46:48:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):240:242 -> a
-    46:48:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    49:51:boolean acceptArrow():474:476 -> a
-    49:51:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):243 -> a
-    49:51:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    52:59:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):245:252 -> a
-    52:59:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    60:60:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
-    60:60:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):262 -> a
-    60:60:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    60:60:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    61:89:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):267:295 -> a
-    61:89:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    61:89:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    90:91:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):290:291 -> a
-    90:91:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    90:91:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    92:92:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> a
-    92:92:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):291 -> a
-    92:92:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    92:92:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    93:99:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):291:297 -> a
-    93:99:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    93:99:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    100:100:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():437:437 -> a
-    100:100:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):298 -> a
-    100:100:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    100:100:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    101:103:void expectWhitespace():193:195 -> a
-    101:103:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():438 -> a
-    101:103:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):298 -> a
-    101:103:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    101:103:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    104:128:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():439:463 -> a
-    104:128:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):298 -> a
-    104:128:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    104:128:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    129:136:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):299:306 -> a
-    129:136:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    129:136:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    137:137:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> a
-    137:137:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):306 -> a
-    137:137:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    137:137:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    138:142:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):306:310 -> a
-    138:142:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    138:142:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    143:143:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> a
-    143:143:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):310 -> a
-    143:143:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    143:143:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    144:147:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):310:313 -> a
-    144:147:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    144:147:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    148:149:void skipArrow():469:470 -> a
-    148:149:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):314 -> a
-    148:149:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    148:149:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    150:192:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):315:357 -> a
-    150:192:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    150:192:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    193:193:void expectWhitespace():198:198 -> a
-    193:193:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():438 -> a
-    193:193:void parseMemberMappings(com.android.tools.r8.naming.ClassNaming$Builder):298 -> a
-    193:193:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):253 -> a
-    193:193:void parse(com.android.tools.r8.naming.ProguardMap$Builder):217 -> a
-    194:194:com.android.tools.r8.position.TextPosition getPosition():363:363 -> a
-    195:207:java.lang.String parseType(boolean):421:433 -> a
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:1:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):78:78 -> <init>
+    2:344:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):66:408 -> <init>
+    345:349:void <init>(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean):79:83 -> <init>
+    1:1:int access$000(com.android.tools.r8.naming.ProguardMapReader):63:63 -> a
+    2:3:char peekChar(int):98:99 -> a
+    4:8:boolean isEmptyOrCommentLine(java.lang.String):137:141 -> a
+    9:13:boolean hasFirstCharJsonBrace(java.lang.String,int):164:168 -> a
+    14:14:boolean hasLine():185:185 -> a
+    15:19:void expect(char):207:211 -> a
+    20:20:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> a
+    20:20:void expect(char):211 -> a
+    21:21:void expect(char):211:211 -> a
+    22:22:void expect(char):208:208 -> a
+    23:25:void parse(com.android.tools.r8.naming.ProguardMap$Builder):218:220 -> a
+    26:40:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):227:241 -> a
+    26:40:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    41:46:boolean acceptString(java.lang.String):493:498 -> a
+    41:46:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):241 -> a
+    41:46:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    47:49:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):244:246 -> a
+    47:49:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    50:52:boolean acceptArrow():483:485 -> a
+    50:52:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):247 -> a
+    50:52:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    53:56:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):249:252 -> a
+    53:56:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    57:57:com.android.tools.r8.position.TextPosition getPosition():372:372 -> a
+    57:57:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):254 -> a
+    57:57:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    58:61:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):254:257 -> a
+    58:61:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    62:88:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):286:312 -> a
+    62:88:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    62:88:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    89:90:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):307:308 -> a
+    89:90:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    89:90:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    91:91:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> a
+    91:91:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):308 -> a
+    91:91:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    91:91:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    92:98:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):308:314 -> a
+    92:98:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    92:98:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    99:99:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():446:446 -> a
+    99:99:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):315 -> a
+    99:99:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    99:99:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    100:102:void expectWhitespace():197:199 -> a
+    100:102:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():447 -> a
+    100:102:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):315 -> a
+    100:102:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    100:102:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    103:127:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():448:472 -> a
+    103:127:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):315 -> a
+    103:127:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    103:127:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    128:135:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):316:323 -> a
+    128:135:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    128:135:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    136:136:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> a
+    136:136:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):323 -> a
+    136:136:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    136:136:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    137:141:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):323:327 -> a
+    137:141:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    137:141:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    142:142:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> a
+    142:142:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):327 -> a
+    142:142:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    142:142:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    143:146:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):327:330 -> a
+    143:146:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    143:146:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    147:148:void skipArrow():478:479 -> a
+    147:148:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):331 -> a
+    147:148:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    147:148:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    149:174:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):332:357 -> a
+    149:174:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    149:174:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    175:175:com.android.tools.r8.position.TextPosition getPosition():372:372 -> a
+    175:175:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):357 -> a
+    175:175:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    175:175:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    176:185:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):357:366 -> a
+    176:185:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    176:185:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    186:186:void expectWhitespace():202:202 -> a
+    186:186:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():447 -> a
+    186:186:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):315 -> a
+    186:186:void parseClassMappings(com.android.tools.r8.naming.ProguardMap$Builder):258 -> a
+    186:186:void parse(com.android.tools.r8.naming.ProguardMap$Builder):221 -> a
+    187:199:java.lang.String parseType(boolean):430:442 -> a
     boolean isSimpleDigit(char) -> b
-    1:1:int access$100(com.android.tools.r8.naming.ProguardMapReader):61:61 -> b
-    2:2:boolean hasLine():181:181 -> b
-    3:14:void skipIdentifier(boolean):370:381 -> b
-    15:15:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> b
-    15:15:void skipIdentifier(boolean):381 -> b
-    16:28:void skipIdentifier(boolean):381:393 -> b
-    29:29:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> b
-    29:29:void skipIdentifier(boolean):393 -> b
-    30:30:void skipIdentifier(boolean):393:393 -> b
-    31:31:void skipIdentifier(boolean):386:386 -> b
-    32:36:java.lang.String substring(int):402:406 -> b
-    1:1:boolean hasNext():100:100 -> c
-    1:1:void close():70:70 -> close
-    1:8:boolean isCommentLineWithJsonBrace():145:152 -> d
-    1:12:java.lang.Object maybeParseRangeOrInt():499:510 -> e
-    1:5:char nextChar():114:118 -> f
-    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> f
-    6:6:char nextChar():118 -> f
-    7:7:char nextChar():118:118 -> f
-    1:5:int nextCodePoint():105:109 -> g
-    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> g
-    6:6:int nextCodePoint():109 -> g
-    7:7:int nextCodePoint():109:109 -> g
-    1:1:boolean nextLine():123:123 -> h
-    2:7:boolean skipLine():172:177 -> h
-    2:7:boolean nextLine():126 -> h
-    8:8:boolean nextLine():124:124 -> h
-    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> h
-    9:9:boolean nextLine():124 -> h
-    10:10:boolean nextLine():124:124 -> h
-    1:7:com.android.tools.r8.com.google.gson.JsonObject parseJsonInComment():526:532 -> i
-    1:7:java.lang.String parseMethodName():411:417 -> j
-    1:7:int parseNumber():515:521 -> k
-    8:8:int parseNumber():516:516 -> k
-    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):547:547 -> k
-    9:9:int parseNumber():516 -> k
-    10:10:int parseNumber():516:516 -> k
-    1:1:int peekCodePoint():90:90 -> l
-    1:2:void skipWhitespace():186:187 -> m
-com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.S:
+    1:1:int access$100(com.android.tools.r8.naming.ProguardMapReader):63:63 -> b
+    2:2:boolean hasNext():104:104 -> b
+    3:14:void skipIdentifier(boolean):379:390 -> b
+    15:15:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> b
+    15:15:void skipIdentifier(boolean):390 -> b
+    16:28:void skipIdentifier(boolean):390:402 -> b
+    29:29:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> b
+    29:29:void skipIdentifier(boolean):402 -> b
+    30:30:void skipIdentifier(boolean):402:402 -> b
+    31:31:void skipIdentifier(boolean):395:395 -> b
+    32:36:java.lang.String substring(int):411:415 -> b
+    1:8:boolean isCommentLineWithJsonBrace():149:156 -> c
+    1:1:void close():72:72 -> close
+    1:12:java.lang.Object maybeParseRangeOrInt():508:519 -> d
+    1:5:char nextChar():118:122 -> e
+    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> e
+    6:6:char nextChar():122 -> e
+    7:7:char nextChar():122:122 -> e
+    1:5:int nextCodePoint():109:113 -> f
+    6:6:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> f
+    6:6:int nextCodePoint():113 -> f
+    7:7:int nextCodePoint():113:113 -> f
+    1:1:boolean nextLine():127:127 -> g
+    2:7:boolean skipLine():176:181 -> g
+    2:7:boolean nextLine():130 -> g
+    8:8:boolean nextLine():128:128 -> g
+    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> g
+    9:9:boolean nextLine():128 -> g
+    10:10:boolean nextLine():128:128 -> g
+    1:1:com.android.tools.r8.naming.mappinginformation.MappingInformation parseMappingInformation():264:264 -> h
+    2:8:com.android.tools.r8.com.google.gson.JsonObject parseJsonInComment():535:541 -> h
+    2:8:com.android.tools.r8.naming.mappinginformation.MappingInformation parseMappingInformation():266 -> h
+    9:9:com.android.tools.r8.naming.mappinginformation.MappingInformation parseMappingInformation():266:266 -> h
+    10:17:com.android.tools.r8.naming.mappinginformation.MappingInformation parseMappingInformation():265:272 -> h
+    1:7:java.lang.String parseMethodName():420:426 -> i
+    1:7:int parseNumber():524:530 -> j
+    8:8:int parseNumber():525:525 -> j
+    9:9:void com.android.tools.r8.naming.ProguardMapReader$ParseException.<init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String):556:556 -> j
+    9:9:int parseNumber():525 -> j
+    10:10:int parseNumber():525:525 -> j
+    1:1:int peekCodePoint():94:94 -> k
+    1:2:void skipWhitespace():190:191 -> l
+com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.T:
     int lineOffset -> b
     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):550:554 -> <init>
-    1:4:java.lang.String toString():559:562 -> toString
+    1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):559:563 -> <init>
+    1:4:java.lang.String toString():568:571 -> toString
 com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.tw:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -68318,50 +68352,50 @@
     boolean $assertionsDisabled -> f
     int PG_MAP_ID_LENGTH -> e
     com.android.tools.r8.StringConsumer consumer -> b
-    1:10:void <clinit>():20:29 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.utils.InternalOptions):46:55 -> <init>
-    1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.naming.ProguardMapSupplier):20:20 -> a
-    2:2:com.android.tools.r8.naming.ProguardMapSupplier create(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.utils.InternalOptions):60:60 -> a
-    3:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId com.android.tools.r8.naming.ProguardMapSupplier.computeProguardMapId():72:74 -> a
-    3:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():64 -> a
-    6:23:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):82:99 -> a
-    6:23:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():65 -> a
-    24:30:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):98:104 -> a
-    24:30:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():65 -> a
-    31:31:void com.android.tools.r8.naming.ProguardMapSupplier.writeBody():78:78 -> a
-    31:31:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():66 -> a
-    32:32:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():67:67 -> a
-    1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):20:20 -> b
+    1:10:void <clinit>():21:30 -> <clinit>
+    1:10:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.utils.InternalOptions):47:56 -> <init>
+    1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.naming.ProguardMapSupplier):21:21 -> a
+    2:2:com.android.tools.r8.naming.ProguardMapSupplier create(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.utils.InternalOptions):61:61 -> a
+    3:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId com.android.tools.r8.naming.ProguardMapSupplier.computeProguardMapId():73:75 -> a
+    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
+    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.tw$a:
 com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.tw$b:
     java.lang.StringBuilder contents -> b
     com.android.tools.r8.StringConsumer inner -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():136:136 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.StringConsumer):141:141 -> <init>
-    2:9:void <init>(com.android.tools.r8.StringConsumer):139:146 -> <init>
-    10:10:void <init>(com.android.tools.r8.StringConsumer):144:144 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):151:152 -> accept
-    1:2:void finished(com.android.tools.r8.DiagnosticsHandler):157:158 -> finished
-    3:5:boolean com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker.validateProguardMapParses(java.lang.String):163:165 -> finished
-    3:5:void finished(com.android.tools.r8.DiagnosticsHandler):158 -> finished
-    6:6:void finished(com.android.tools.r8.DiagnosticsHandler):158:158 -> finished
+    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.tw$c:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier$1):33:33 -> <init>
-    2:4:void <init>(java.lang.String):35:37 -> <init>
+    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.tw$d:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
-    1:3:void <init>():107:109 -> <init>
-    1:4:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder.accept(java.lang.String):113:116 -> a
-    1:4:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):107 -> a
-    5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build():123:123 -> a
+    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.tw$e:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):127:127 -> <init>
-    1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):131:131 -> a
-    1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):127 -> a
+    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.ty:
     int to -> b
     int from -> a
@@ -68370,7 +68404,7 @@
     1:6:boolean equals(java.lang.Object):32:37 -> equals
     1:2:int hashCode():42:43 -> hashCode
     1:1:java.lang.String toString():24:24 -> toString
-com.android.tools.r8.naming.RecordRewritingNamingLens -> com.android.tools.r8.naming.U:
+com.android.tools.r8.naming.RecordRewritingNamingLens -> com.android.tools.r8.naming.V:
     com.android.tools.r8.graph.DexItemFactory factory -> f
     int $r8$clinit -> h
     boolean $assertionsDisabled -> g
@@ -68390,7 +68424,7 @@
     11:14:com.android.tools.r8.graph.DexString lookupDescriptorForJavaTypeName(java.lang.String):79:82 -> a
     1:1:java.lang.String lookupPackageName(java.lang.String):87:87 -> b
     2:2:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):92:92 -> b
-com.android.tools.r8.naming.ReservedFieldNamingState -> com.android.tools.r8.naming.W:
+com.android.tools.r8.naming.ReservedFieldNamingState -> com.android.tools.r8.naming.X:
     1:1:void <init>(com.android.tools.r8.graph.AppView):18:18 -> <init>
     1:2:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):35:36 -> a
     3:6:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.FieldNamingStateBase.getInternalStateKey(com.android.tools.r8.graph.DexType):40:43 -> a
@@ -68405,7 +68439,7 @@
     10:10:com.android.tools.r8.naming.ReservedFieldNamingState$InternalState createInternalState():48:48 -> a
     10:10:java.lang.Object createInternalState():15 -> a
     1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState):41:42 -> b
-com.android.tools.r8.naming.ReservedFieldNamingState$InternalState -> com.android.tools.r8.naming.V:
+com.android.tools.r8.naming.ReservedFieldNamingState$InternalState -> com.android.tools.r8.naming.W:
     java.util.Map reservedNamesDirect -> a
     java.util.Map reservedNamesBelow -> b
     1:4:void <init>():51:54 -> <init>
@@ -68413,45 +68447,46 @@
     3:3:void markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):62:62 -> a
     4:4:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):66:66 -> a
     1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):70:71 -> b
-com.android.tools.r8.naming.SeedMapper -> com.android.tools.r8.naming.X:
+com.android.tools.r8.naming.SeedMapper -> com.android.tools.r8.naming.Y:
     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):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.X$a:
-com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.naming.X$b:
+    1:1:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):38:38 -> <init>
+    2:10:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter):101:109 -> <init>
+    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):91:91 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):82:83 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):91 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):77:77 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):84 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):91 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):85:87 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):91 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):83:87 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):91 -> a
+    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):151:151 -> a
+    14:14:java.util.Set getKeyset():155:155 -> a
+    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):163:163 -> a
+    1:1:java.util.Set getMappedToDescriptorNames():159:159 -> b
+    1:10:void verifyMappingsAreConflictFree():113:122 -> c
+    11:11:void verifyMappingsAreConflictFree():119:119 -> c
+    12:35:void verifyMappingsAreConflictFree():118:141 -> 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):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
+    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):40:40 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.Reporter):45:45 -> <init>
+    3:8:void <init>(com.android.tools.r8.utils.Reporter):41:46 -> <init>
+    void addScopedMappingInformation(com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation) -> a
+    1:5:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):52:56 -> a
+    1:5:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):40 -> 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):112:112 -> 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
+    6:6:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):56 -> a
+    6:6:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):40 -> a
+    7:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):58:59 -> a
+    7:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):40 -> a
+    9:10:com.android.tools.r8.naming.SeedMapper build():71:72 -> a
 com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.lC:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexApplication application -> b
@@ -68600,130 +68635,134 @@
     boolean isTypeInitializedFromUse() -> d
 com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.CF:
     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.a:
-    1:1:void <init>():16:16 -> <init>
-    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):31:31 -> a
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.naming.mappinginformation.c:
+    int $r8$clinit -> c
+    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1):13:13 -> <init>
+    2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):35:35 -> <init>
+    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):54:54 -> a
     boolean isCompilerSynthesizedMappingInformation() -> d
-    1:3:java.lang.String serialize():36:38 -> f
-com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.android.tools.r8.naming.mappinginformation.b:
-    java.lang.String fileName -> b
-    1:2:void <init>(java.lang.String):20:21 -> <init>
-    1:1:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isFileNameInformation():0:0 -> a
-    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):48 -> a
+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():30:30 -> b
+com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.android.tools.r8.naming.mappinginformation.d:
+    java.lang.String fileName -> a
+    1:2:void <init>(java.lang.String):21:22 -> <init>
     com.android.tools.r8.naming.mappinginformation.FileNameInformation asFileNameInformation() -> a
-    2:2:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(java.lang.String):52:52 -> a
-    1:1:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):58:58 -> b
-    2:5: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):101:104 -> b
-    2:5:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):59 -> b
-    6:6: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):103:103 -> b
-    6:6:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):59 -> b
-    7:10:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):63:66 -> b
-    11:11:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):65:65 -> b
-    1:4:java.lang.String serialize():30:33 -> f
-    1:1:java.lang.String getFileName():25:25 -> g
-com.android.tools.r8.naming.mappinginformation.MappingInformation -> com.android.tools.r8.naming.mappinginformation.c:
-    int lineNumber -> a
-    1:2:void <init>(int):19:20 -> <init>
+    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):49:49 -> 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):49 -> a
+    3:3:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(java.lang.String):53:53 -> a
+    4:4:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):63:63 -> 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):119:122 -> a
+    5:8:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):64 -> 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):121:121 -> a
+    9:9:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):64 -> a
+    10:13:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):68:71 -> a
+    14:14:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):70:70 -> a
+    1:4:java.lang.String serialize():31:34 -> f
+    1:1:java.lang.String getFileName():26:26 -> g
+com.android.tools.r8.naming.mappinginformation.MappingInformation -> com.android.tools.r8.naming.mappinginformation.e:
+    1:1:void <init>(int):21:21 -> <init>
     boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation) -> a
     com.android.tools.r8.naming.mappinginformation.FileNameInformation asFileNameInformation() -> a
-    1:7:com.android.tools.r8.naming.mappinginformation.MappingInformation fromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):66:72 -> a
-    8:15:com.android.tools.r8.naming.mappinginformation.MappingInformation fromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):71:78 -> a
-    16:29:com.android.tools.r8.naming.mappinginformation.MappingInformation fromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):77:90 -> a
-    30:30:com.android.tools.r8.naming.mappinginformation.MappingInformation fromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):83:83 -> a
-    31:31:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.deserialize(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):43:43 -> a
-    31:31:com.android.tools.r8.naming.mappinginformation.MappingInformation fromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):87 -> a
-    32:32:com.android.tools.r8.naming.mappinginformation.MappingInformation fromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):85:85 -> a
-    com.android.tools.r8.naming.mappinginformation.SignatureMappingInformation asSignatureMappingInformation() -> b
-    1:1:int getLineNumber():24:24 -> c
+    1:7:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):72:78 -> a
+    8:15:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):77:84 -> a
+    16:16:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):83:83 -> a
+    17:27:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):98:108 -> a
+    17:27:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    28:37:com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation 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):60:69 -> a
+    28:37:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):100 -> a
+    28:37:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    38:38:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):105:105 -> a
+    38:38:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    39:39:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation 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.ScopedMappingInformation$ScopeReference):69:69 -> a
+    39:39:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):105 -> a
+    39:39:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    40:40:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():39:39 -> a
+    40:40:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation 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.ScopedMappingInformation$ScopeReference):72 -> a
+    40:40:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):105 -> a
+    40:40:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    41:41:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation 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.ScopedMappingInformation$ScopeReference):73:73 -> a
+    41:41:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):105 -> a
+    41:41:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    42:42:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder.build():30:30 -> a
+    42:42:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation 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.ScopedMappingInformation$ScopeReference):74 -> a
+    42:42:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):105 -> a
+    42:42:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    43:43:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):103:103 -> a
+    43:43:com.android.tools.r8.naming.mappinginformation.MappingInformation 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.ScopedMappingInformation$ScopeReference):87 -> a
+    com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation asMetaInfMappingInformation() -> b
+    com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation asScopedMappingInformation() -> c
     boolean isCompilerSynthesizedMappingInformation() -> d
-    boolean isSignatureMappingInformation() -> e
+    boolean isScopedMappingInformation() -> e
     java.lang.String serialize() -> f
 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):40:41 -> a
-    3:4:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics noKeyForObjectWithId(int,java.lang.String,java.lang.String,java.lang.String):70:71 -> a
-    5:6:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics invalidValueForObjectWithId(int,java.lang.String,java.lang.String):77:78 -> a
-    7:7:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics invalidParameterInformationObject(int):91:91 -> 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
-    3:3:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notValidJson(int):52:52 -> b
     1:2:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notValidString(int,java.lang.String):57:58 -> c
-    3:3:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics tooManyEntriesForParameterInformation(int):85:85 -> c
-    1:1:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics tooManyInformationalParameters(int):63:63 -> d
     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:5:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notAllowedCombination(java.lang.String,java.lang.String,com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation,int):102:106 -> notAllowedCombination
-com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation -> com.android.tools.r8.naming.mappinginformation.e:
-    com.android.tools.r8.naming.MemberNaming$MethodSignature signature -> e
-    com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation$ParameterInformation[] argumentInfos -> b
-    boolean $assertionsDisabled -> f
-    boolean receiver -> c
-    java.lang.String returnType -> d
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.String,boolean,com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation$ParameterInformation[],int):158:162 -> <init>
-    1:1:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isMethodSignatureChangedInformation():0:0 -> a
-    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):67 -> a
-    2:2:boolean com.android.tools.r8.naming.MemberNaming$Signature.isMethodSignature():0:0 -> a
-    2:2:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):78 -> a
-    3:8:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):79:84 -> a
-    9:10:int getNumberOfArgumentsRemoved():121:122 -> a
-    9:10:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):85 -> a
-    11:18:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):86:93 -> a
-    19:22:com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation$ParameterInformation getParameterInformation(int):138:141 -> a
-    19:22:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):94 -> a
-    23:39:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):95:111 -> a
-    40:40:java.lang.String getReturnType():134:134 -> a
-    40:40:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):111 -> a
-    41:41:com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
-    1:1:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):168:168 -> b
-    2:5: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):101:104 -> b
-    2:5:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):169 -> b
-    6:6: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):103:103 -> b
-    6:6:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):169 -> b
-    7:7:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):170:170 -> b
-    8: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):101:104 -> b
-    8:11:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):171 -> b
-    12:12: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):103:103 -> b
-    12:12:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):171 -> b
-    13:13:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):172:172 -> b
-    14:17: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):101:104 -> b
-    14:17:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):173 -> b
-    18:18: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):103:103 -> b
-    18:18:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):173 -> b
-    19:34:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):174:189 -> b
-    35:45:com.android.tools.r8.naming.mappinginformation.MappingInformation build(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int):188:198 -> b
-    1:2:java.lang.String serialize():52:53 -> f
-    3:9:com.android.tools.r8.com.google.gson.JsonObject com.android.tools.r8.naming.mappinginformation.SignatureMappingInformation.serializeMethodSignature(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.MemberNaming$MethodSignature):38:44 -> f
-    3:9:java.lang.String serialize():53 -> f
-    10:18:java.lang.String serialize():54:62 -> f
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature getSignature():72:72 -> g
-com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation$ParameterInformation -> com.android.tools.r8.naming.mappinginformation.d:
-    java.lang.String type -> b
-    boolean $assertionsDisabled -> c
-    int index -> a
-    1:1:void <clinit>():203:203 -> <clinit>
-    1:3:void <init>(int,java.lang.String):215:217 -> <init>
-    1:1:java.lang.String access$000(com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation$ParameterInformation):203:203 -> a
-    2:2:java.lang.String getType():212:212 -> a
-    3:17:com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation$ParameterInformation fromJsonArray(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.DiagnosticsHandler,int):222:236 -> a
-    1:1:int access$100(com.android.tools.r8.naming.mappinginformation.MethodSignatureChangedInformation$ParameterInformation):203:203 -> b
-    2:5:com.android.tools.r8.com.google.gson.JsonArray serialize():250:253 -> b
-com.android.tools.r8.naming.mappinginformation.SignatureMappingInformation -> com.android.tools.r8.naming.mappinginformation.f:
-    1:1:void <init>(int):19:19 -> <init>
-    com.android.tools.r8.naming.MemberNaming$Signature apply(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
-    1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature getMethodSignature(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String,com.android.tools.r8.DiagnosticsHandler,int):50:50 -> a
-    2:5: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):101:104 -> a
-    2:5:com.android.tools.r8.naming.MemberNaming$MethodSignature getMethodSignature(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String,com.android.tools.r8.DiagnosticsHandler,int):51 -> a
-    6:6: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):103:103 -> a
-    6:6:com.android.tools.r8.naming.MemberNaming$MethodSignature getMethodSignature(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String,com.android.tools.r8.DiagnosticsHandler,int):51 -> a
-    7:7:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonArray():46:46 -> a
-    7:7:com.android.tools.r8.naming.MemberNaming$MethodSignature getMethodSignature(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String,com.android.tools.r8.DiagnosticsHandler,int):52 -> a
-    8:14:com.android.tools.r8.naming.MemberNaming$MethodSignature getMethodSignature(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String,com.android.tools.r8.DiagnosticsHandler,int):56:62 -> a
-    com.android.tools.r8.naming.mappinginformation.SignatureMappingInformation asSignatureMappingInformation() -> b
-    boolean isSignatureMappingInformation() -> e
-    com.android.tools.r8.naming.MemberNaming$Signature getSignature() -> g
+com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation -> com.android.tools.r8.naming.mappinginformation.f:
+    com.android.tools.r8.naming.MapVersion mapVersion -> a
+    1:2:void <init>(com.android.tools.r8.naming.MapVersion):22:23 -> <init>
+    1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):38:38 -> a
+    2:2:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isMetaInfMappingInformation():0:0 -> a
+    2:2:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):38 -> a
+    com.android.tools.r8.naming.mappinginformation.MetaInfMappingInformation asMetaInfMappingInformation() -> b
+    1:4:java.lang.String serialize():47:50 -> f
+    1:1:com.android.tools.r8.naming.MapVersion getMapVersion():42:42 -> g
+com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation -> com.android.tools.r8.naming.mappinginformation.i:
+    com.android.tools.r8.com.google.common.collect.ImmutableList scopeReferences -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):95:97 -> <init>
+    1:2:void forEach(java.util.function.BiConsumer):113:114 -> a
+    3:3:java.lang.String com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ClassScopeReference.toReferenceString():49:49 -> a
+    3:3:void forEach(java.util.function.BiConsumer):114 -> a
+    4:4:void forEach(java.util.function.BiConsumer):114:114 -> a
+    5:5:void lambda$serialize$0(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference):122:122 -> a
+    6:6:java.lang.String com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ClassScopeReference.toReferenceString():49:49 -> a
+    6:6:void lambda$serialize$0(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference):122 -> a
+    7:7:void lambda$serialize$0(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference):122:122 -> a
+    com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation asScopedMappingInformation() -> c
+    boolean isScopedMappingInformation() -> e
+    1:1:java.lang.String serialize():120:120 -> f
+    2:2:com.android.tools.r8.com.google.gson.JsonObject com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.serializeToJsonObject(com.android.tools.r8.com.google.gson.JsonObject):59:59 -> f
+    2:2:java.lang.String serialize():120 -> f
+    3:6:java.lang.String serialize():121:124 -> f
+com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder -> com.android.tools.r8.naming.mappinginformation.g:
+    com.android.tools.r8.com.google.common.collect.ImmutableList$Builder scope -> a
+    1:6:void <init>():53:58 -> <init>
+    1:4:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder deserializeFromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference,com.android.tools.r8.DiagnosticsHandler,int):65:68 -> a
+    5:6:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference.fromReferenceString(java.lang.String):26:27 -> a
+    5:6:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder deserializeFromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference,com.android.tools.r8.DiagnosticsHandler,int):68 -> a
+    7:7:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder addScopeReference(com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference):81:81 -> a
+    7:7:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder deserializeFromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference,com.android.tools.r8.DiagnosticsHandler,int):68 -> a
+    8:8:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference.fromReferenceString(java.lang.String):29:29 -> a
+    8:8:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder deserializeFromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference,com.android.tools.r8.DiagnosticsHandler,int):68 -> a
+    9:9:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder addScopeReference(com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference):81:81 -> a
+    9:9:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder deserializeFromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference,com.android.tools.r8.DiagnosticsHandler,int):71 -> a
+    10:10:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder deserializeFromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference,com.android.tools.r8.DiagnosticsHandler,int):74:74 -> a
+    11:15:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder deserializeFromJsonObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference,com.android.tools.r8.DiagnosticsHandler,int):73:77 -> a
+    16:17:com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$Builder addScopeReference(com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference):81:82 -> a
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableList buildScope():86:86 -> a
+com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ClassScopeReference -> com.android.tools.r8.naming.mappinginformation.h:
+    com.android.tools.r8.references.ClassReference reference -> a
+    1:2:void <init>(com.android.tools.r8.references.ClassReference):43:44 -> <init>
+com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ScopeReference -> com.android.tools.r8.naming.mappinginformation.i$a:
+    1:1:void <init>():23:23 -> <init>
+    1:1:java.lang.String toString():36:36 -> toString
+    2:2:java.lang.String com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation$ClassScopeReference.toReferenceString():49:49 -> toString
+    2:2:java.lang.String toString():36 -> toString
 com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Hd:
     void parsedIdentifier(java.lang.String) -> a
     java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String) -> a
@@ -71612,29 +71651,30 @@
     boolean $assertionsDisabled -> e
     boolean isVerbose -> a
     java.lang.String regularExpression -> b
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:8:void <init>(java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.ProguardMapProducer,boolean):27:34 -> <init>
-    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder builder():55:55 -> builder
-    2:2:com.android.tools.r8.retrace.RetraceOptions$Builder builder(com.android.tools.r8.DiagnosticsHandler):60:60 -> builder
-    1:1:com.android.tools.r8.DiagnosticsHandler getDiagnosticsHandler():46:46 -> getDiagnosticsHandler
-    1:1:com.android.tools.r8.retrace.ProguardMapProducer getProguardMapProducer():50:50 -> getProguardMapProducer
-    1:1:java.lang.String getRegularExpression():42:42 -> getRegularExpression
-    1:1:boolean isVerbose():38:38 -> isVerbose
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:8:void <init>(java.lang.String,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.ProguardMapProducer,boolean):28:35 -> <init>
+    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder builder():56:56 -> builder
+    2:2:com.android.tools.r8.retrace.RetraceOptions$Builder builder(com.android.tools.r8.DiagnosticsHandler):61:61 -> builder
+    1:1:java.lang.String defaultRegularExpression():65:65 -> defaultRegularExpression
+    1:1:com.android.tools.r8.DiagnosticsHandler getDiagnosticsHandler():47:47 -> getDiagnosticsHandler
+    1:1:com.android.tools.r8.retrace.ProguardMapProducer getProguardMapProducer():51:51 -> getProguardMapProducer
+    1:1:java.lang.String getRegularExpression():43:43 -> getRegularExpression
+    1:1:boolean isVerbose():39:39 -> isVerbose
 com.android.tools.r8.retrace.RetraceOptions$1 -> com.android.tools.r8.retrace.RetraceOptions$a:
-    1:1:void <init>():55:55 -> <init>
+    1:1:void <init>():56:56 -> <init>
 com.android.tools.r8.retrace.RetraceOptions$Builder -> com.android.tools.r8.retrace.RetraceOptions$Builder:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> c
     boolean isVerbose -> a
     java.lang.String regularExpression -> d
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):71:71 -> <init>
-    2:5:void <init>(com.android.tools.r8.DiagnosticsHandler):69:72 -> <init>
-    1:7:com.android.tools.r8.retrace.RetraceOptions build():104:110 -> build
-    8:8:com.android.tools.r8.retrace.RetraceOptions build():108:108 -> build
-    9:9:com.android.tools.r8.retrace.RetraceOptions build():105:105 -> build
-    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder setProguardMapProducer(com.android.tools.r8.retrace.ProguardMapProducer):87:87 -> setProguardMapProducer
-    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder setRegularExpression(java.lang.String):99:99 -> setRegularExpression
-    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder setVerbose(boolean):77:77 -> setVerbose
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):76:76 -> <init>
+    2:5:void <init>(com.android.tools.r8.DiagnosticsHandler):74:77 -> <init>
+    1:7:com.android.tools.r8.retrace.RetraceOptions build():109:115 -> build
+    8:8:com.android.tools.r8.retrace.RetraceOptions build():113:113 -> build
+    9:9:com.android.tools.r8.retrace.RetraceOptions build():110:110 -> build
+    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder setProguardMapProducer(com.android.tools.r8.retrace.ProguardMapProducer):92:92 -> setProguardMapProducer
+    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder setRegularExpression(java.lang.String):104:104 -> setRegularExpression
+    1:1:com.android.tools.r8.retrace.RetraceOptions$Builder setVerbose(boolean):82:82 -> setVerbose
 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
 com.android.tools.r8.retrace.StackTraceElementProxy -> com.android.tools.r8.retrace.StackTraceElementProxy:
@@ -71743,105 +71783,105 @@
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
     com.android.tools.r8.retrace.Retracer retracer -> c
     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.Retracer):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$ElementImpl,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.Retracer):44:44 -> a
-    4:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):49:49 -> a
-    5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):72:72 -> a
-    6:7:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):75:76 -> a
-    8:8:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):85:85 -> 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):101:101 -> a
-    10:10:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():177:177 -> 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):102 -> 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):102:115 -> 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$ElementImpl):105:113 -> a
-    34:34:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):138:138 -> a
-    35:35:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():177:177 -> a
-    35:35:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):139 -> a
-    36:41:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):139:144 -> 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$ElementImpl):142:142 -> a
-    45:58:java.util.List getMappedRangesForFrame(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl,com.android.tools.r8.retrace.internal.MethodDefinition,int):149:162 -> a
-    59:64:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl createElement():181:186 -> a
-    65:65:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl createElement():183:183 -> a
-    1:1:com.android.tools.r8.retrace.Retracer access$200(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):29:29 -> b
-    2:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(java.lang.String):60:60 -> b
-    3:7:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):88:92 -> b
-    1:1:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.stream():173:173 -> forEach
-    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.forEach(java.util.function.Consumer):192 -> forEach
-    1:1:com.android.tools.r8.retrace.RetraceClassResult forEach(java.util.function.Consumer):29 -> forEach
-    2:2:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.forEach(java.util.function.Consumer):192:192 -> forEach
-    2:2:com.android.tools.r8.retrace.RetraceClassResult forEach(java.util.function.Consumer):29 -> forEach
-    1:1:boolean hasRetraceResult():168:168 -> hasRetraceResult
-    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String):49:49 -> 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):54:55 -> 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.Retracer):35:38 -> <init>
+    1:1:com.android.tools.r8.references.ClassReference access$100(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):28:28 -> a
+    2:2:java.util.List access$300(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl,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.Retracer):43:43 -> a
+    4:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):48:48 -> a
+    5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):71:71 -> a
+    6:7:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):74:75 -> a
+    8:8:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):84:84 -> 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):100:100 -> a
+    10:10:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():176:176 -> 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):101 -> 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):101:114 -> 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$ElementImpl):104:112 -> a
+    34:34:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):137:137 -> a
+    35:35:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.internalStream():176:176 -> a
+    35:35:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):138 -> a
+    36:41:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):138:143 -> 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$ElementImpl):141:141 -> a
+    45:58:java.util.List getMappedRangesForFrame(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl,com.android.tools.r8.retrace.internal.MethodDefinition,int):148:161 -> a
+    59:64:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl createElement():180:185 -> a
+    65:65:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl createElement():182:182 -> a
+    1:1:com.android.tools.r8.retrace.Retracer 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):59:59 -> b
+    3:7:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):87:91 -> b
+    1:1:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceClassResultImpl.stream():172:172 -> forEach
+    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.forEach(java.util.function.Consumer):191 -> forEach
+    1:1:com.android.tools.r8.retrace.RetraceClassResult forEach(java.util.function.Consumer):28 -> forEach
+    2:2:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.forEach(java.util.function.Consumer):191:191 -> forEach
+    2:2:com.android.tools.r8.retrace.RetraceClassResult forEach(java.util.function.Consumer):28 -> forEach
+    1:1:boolean hasRetraceResult():167:167 -> hasRetraceResult
+    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupField(java.lang.String):48:48 -> 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):53:54 -> 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):55 -> 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):54:54 -> 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):120:120 -> 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):125:125 -> 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):131:133 -> 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):132:132 -> 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):131:131 -> 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):60:60 -> 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):66:68 -> 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):67:67 -> 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):66:66 -> lookupMethod
-    6:6:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):29 -> lookupMethod
-    1:1:java.util.stream.Stream stream():173:173 -> stream
+    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):54 -> 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):53:53 -> 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):119:119 -> 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):124:124 -> 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):130:132 -> 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):131:131 -> 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):130:130 -> 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):59:59 -> 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):65:67 -> 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):66:66 -> 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):65:65 -> 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():172:172 -> stream
 com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl -> com.android.tools.r8.internal.tA:
     com.android.tools.r8.retrace.internal.RetracedClassImpl classReference -> b
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
-    1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetracedClassImpl,com.android.tools.r8.naming.ClassNamingForNameMapper):219:222 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$000(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl):210:210 -> a
-    2:2:com.android.tools.r8.retrace.internal.RetracedClassImpl getRetracedClass():227:227 -> a
-    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):264:264 -> a
-    4:5:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):267:268 -> a
-    6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):282:282 -> 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):298:308 -> a
-    18:24:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):336:342 -> a
-    25:30:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):340:345 -> a
-    1:5:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):285:289 -> b
-    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.getRetraceClassResult():232:232 -> getRetraceClassResult
-    1:1:com.android.tools.r8.retrace.RetraceClassResult getRetraceClassResult():210 -> getRetraceClassResult
-    1:1:com.android.tools.r8.retrace.internal.RetracedClassImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.getRetracedClass():227:227 -> getRetracedClass
-    1:1:com.android.tools.r8.retrace.RetracedClass getRetracedClass():210 -> getRetracedClass
-    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupField(java.lang.String):260:260 -> lookupField
-    1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):210 -> lookupField
-    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupFrame(java.lang.String,int):318:318 -> lookupFrame
-    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupFrame(java.lang.String):313 -> lookupFrame
-    1:3:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String):210 -> lookupFrame
-    4:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupFrame(java.lang.String,int):318:318 -> lookupFrame
-    4:6:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int):210 -> lookupFrame
-    7:10:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):328:331 -> lookupFrame
-    11:11:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):330:330 -> lookupFrame
-    12:12:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):329:329 -> lookupFrame
-    13:13:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):328:328 -> lookupFrame
-    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupMethod(java.lang.String):278:278 -> lookupMethod
-    1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):210 -> lookupMethod
-    1:6:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):237:242 -> retraceSourceFile
-    1:6:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):210 -> retraceSourceFile
-    7:7:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isFileNameInformation():0:0 -> retraceSourceFile
-    7:7:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):242 -> retraceSourceFile
-    7:7:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):210 -> retraceSourceFile
-    8:17:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):243:252 -> retraceSourceFile
-    8:17:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):210 -> retraceSourceFile
-    18:18:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):250:250 -> retraceSourceFile
-    18:18:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):210 -> retraceSourceFile
+    1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetracedClassImpl,com.android.tools.r8.naming.ClassNamingForNameMapper):218:221 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$000(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl):209:209 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetracedClassImpl getRetracedClass():226:226 -> a
+    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):259:259 -> a
+    4:5:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):262:263 -> a
+    6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):277:277 -> 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):293:303 -> a
+    18:24:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):331:337 -> a
+    25:30:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl lookupFrame(com.android.tools.r8.retrace.internal.MethodDefinition,int):335:340 -> a
+    1:5:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):280:284 -> b
+    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.getRetraceClassResult():231:231 -> getRetraceClassResult
+    1:1:com.android.tools.r8.retrace.RetraceClassResult getRetraceClassResult():209 -> getRetraceClassResult
+    1:1:com.android.tools.r8.retrace.internal.RetracedClassImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.getRetracedClass():226:226 -> getRetracedClass
+    1:1:com.android.tools.r8.retrace.RetracedClass getRetracedClass():209 -> getRetracedClass
+    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupField(java.lang.String):255:255 -> lookupField
+    1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):209 -> lookupField
+    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupFrame(java.lang.String,int):313:313 -> lookupFrame
+    1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupFrame(java.lang.String):308 -> lookupFrame
+    1:3:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String):209 -> lookupFrame
+    4:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupFrame(java.lang.String,int):313:313 -> lookupFrame
+    4:6:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int):209 -> lookupFrame
+    7:10:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):323:326 -> lookupFrame
+    11:11:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):325:325 -> lookupFrame
+    12:12:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):324:324 -> lookupFrame
+    13:13:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(java.lang.String,int,java.util.List,com.android.tools.r8.references.TypeReference):323:323 -> lookupFrame
+    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.lookupMethod(java.lang.String):273:273 -> lookupMethod
+    1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):209 -> lookupMethod
+    1:3:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):236:238 -> retraceSourceFile
+    1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):209 -> 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$ElementImpl.retraceSourceFile(java.lang.String):238 -> retraceSourceFile
+    4:4:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):209 -> retraceSourceFile
+    5:13:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):239:247 -> retraceSourceFile
+    5:13:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):209 -> retraceSourceFile
+    14:14:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl.retraceSourceFile(java.lang.String):245:245 -> retraceSourceFile
+    14:14:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):209 -> retraceSourceFile
 com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.uA:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.Retracer) -> a
 com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.yA:
@@ -71902,7 +71942,7 @@
     47:50:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl):107:110 -> a
     51:56:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ElementImpl):109:114 -> a
     57:57:com.android.tools.r8.retrace.internal.RetracedMethodImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):127:127 -> a
-    58:63:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():496:501 -> a
+    58:63:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():484:489 -> a
     58:63:com.android.tools.r8.retrace.internal.RetracedMethodImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):128 -> a
     64:71:com.android.tools.r8.retrace.internal.RetracedMethodImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):129:136 -> a
     72:72:com.android.tools.r8.retrace.internal.RetracedMethodImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):135:135 -> a
@@ -72592,105 +72632,105 @@
     1:1:boolean access$000(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):28:28 -> a
     2:2:com.android.tools.r8.shaking.AnnotationRemover$Builder builder():51:51 -> a
     3:3:boolean filterAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):60:60 -> a
-    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):221 -> a
-    4:5:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):134:135 -> a
-    4:5:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):129 -> a
+    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):225 -> a
+    4:5:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):138:139 -> a
+    4:5:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):133 -> a
     4:5:boolean filterAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):61 -> a
-    4:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):221 -> a
+    4:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):225 -> a
     6:6:boolean filterAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):61:61 -> a
-    6:6:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):221 -> a
-    7:7:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):223:223 -> a
-    8:17:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):76:85 -> a
-    18:18:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):153:153 -> a
-    18:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):86 -> a
-    19:19:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):86:86 -> a
-    20:20:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):144:144 -> a
-    20:20:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):87 -> a
-    21:21:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):87:87 -> a
-    22:22:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):139:139 -> a
-    22:22:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):88 -> a
-    23:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):88:90 -> a
-    26:28:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):89:91 -> a
-    29:29:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):289:289 -> a
-    29:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):91 -> a
-    30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):305:305 -> a
-    30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):94 -> a
-    31:33:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):95:97 -> a
-    34:38:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):96:100 -> a
-    39:39:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):310:310 -> a
-    39:39:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):101 -> a
-    40:40:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):300:300 -> a
-    40:40:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):104 -> a
-    41:41:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):124:124 -> a
-    42:48:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):112:118 -> a
-    49:66:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):142:159 -> a
-    67:72:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):149:154 -> a
-    73:73:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):129:129 -> a
-    73:73:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):161 -> a
-    74:75:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):134:135 -> a
-    74:75:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):129 -> a
-    74:75:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):161 -> a
-    76:80:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):174:178 -> a
-    76:80:boolean access$100(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):28 -> a
-    81:81:com.android.tools.r8.graph.DexAnnotation lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):189:189 -> a
-    82:82:void lambda$run$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):190:190 -> a
-    83:83:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):191:191 -> a
-    84:84:com.android.tools.r8.graph.DexAnnotation lambda$processMethod$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):197:197 -> a
-    85:85:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):197:197 -> a
-    86:94:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):196:204 -> a
-    95:95:com.android.tools.r8.graph.DexAnnotation lambda$processField$4(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexAnnotation):210:210 -> a
-    96:96:void processField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):210:210 -> a
-    97:103:void processField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):209:215 -> a
-    104:116:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):229:241 -> a
-    117:117:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):240:240 -> a
-    118:118:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):237:237 -> a
-    119:119:boolean lambda$rewriteAnnotationElement$6(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):257:257 -> a
-    120:128:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):284:292 -> a
-    129:130:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):269:270 -> a
-    129:130:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):293 -> a
-    131:132:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):328:329 -> a
-    133:172:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):296:335 -> a
-    173:185:boolean lambda$stripAttributes$7(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):307:319 -> a
-    186:188:void clearAnnotations(com.android.tools.r8.graph.AppView):340:342 -> a
-    1:1:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165:165 -> b
+    6:6:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):225 -> a
+    7:7:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):227:227 -> a
+    8:21:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):76:89 -> a
+    22:22:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):153:153 -> a
+    22:22:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):90 -> a
+    23:23:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):90:90 -> a
+    24:24:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):144:144 -> a
+    24:24:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):91 -> a
+    25:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):91:91 -> a
+    26:26:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):139:139 -> a
+    26:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):92 -> a
+    27:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):92:94 -> a
+    30:32:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):93:95 -> a
+    33:33:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):289:289 -> a
+    33:33:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):95 -> a
+    34:34:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):305:305 -> a
+    34:34:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):98 -> a
+    35:37:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):99:101 -> a
+    38:42:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):100:104 -> a
+    43:43:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):310:310 -> a
+    43:43:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):105 -> a
+    44:44:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):300:300 -> a
+    44:44:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):108 -> a
+    45:45:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):128:128 -> a
+    46:52:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):116:122 -> a
+    53:70:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):146:163 -> a
+    71:76:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):153:158 -> a
+    77:77:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):133:133 -> a
+    77:77:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):165 -> a
+    78:79:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):138:139 -> a
+    78:79:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):133 -> a
+    78:79:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):165 -> a
+    80:84:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):178:182 -> a
+    80:84:boolean access$100(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):28 -> a
+    85:85:com.android.tools.r8.graph.DexAnnotation lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):193:193 -> a
+    86:86:void lambda$run$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):194:194 -> a
+    87:87:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):195:195 -> a
+    88:88:com.android.tools.r8.graph.DexAnnotation lambda$processMethod$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):201:201 -> a
+    89:89:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):201:201 -> a
+    90:98:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):200:208 -> a
+    99:99:com.android.tools.r8.graph.DexAnnotation lambda$processField$4(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexAnnotation):214:214 -> a
+    100:100:void processField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):214:214 -> a
+    101:107:void processField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):213:219 -> a
+    108:120:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):233:245 -> a
+    121:121:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):244:244 -> a
+    122:122:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):241:241 -> a
+    123:123:boolean lambda$rewriteAnnotationElement$6(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):261:261 -> a
+    124:132:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):288:296 -> a
+    133:134:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):273:274 -> a
+    133:134:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):297 -> a
+    135:136:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):332:333 -> a
+    137:176:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):300:339 -> a
+    177:189:boolean lambda$stripAttributes$7(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):311:323 -> a
+    190:192:void clearAnnotations(com.android.tools.r8.graph.AppView):344:346 -> a
+    1:1:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169:169 -> b
     2:8:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> b
-    2:8:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    2:8:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     9:9:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     9:9:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> b
-    9:9:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    9:9:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     10:13:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> b
-    10:13:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    10:13:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     14:14:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> b
-    14:14:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    14:14:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     15:18:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:156 -> b
-    15:18:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    15:18:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     19:19:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156 -> b
-    19:19:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    19:19:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     20:28:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156:164 -> b
-    20:28:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    20:28:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     29:29:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     29:29:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164 -> b
-    29:29:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
+    29:29:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
     30:30:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164:164 -> b
-    30:30:com.android.tools.r8.shaking.AnnotationRemover ensureValid():165 -> b
-    31:41:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):247:257 -> b
-    42:44:boolean enclosingMethodPinned(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):263:265 -> b
+    30:30:com.android.tools.r8.shaking.AnnotationRemover ensureValid():169 -> b
+    31:41:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):251:261 -> b
+    42:44:boolean enclosingMethodPinned(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):267:269 -> b
     1:1:java.util.Set getClassesToRetainInnerClassAttributeFor():55:55 -> c
-    1:4:void run():186:189 -> d
-    5:8:void run():188:191 -> d
+    1:4:void run():190:193 -> d
+    5:8:void run():192:195 -> d
 com.android.tools.r8.shaking.AnnotationRemover$1 -> com.android.tools.r8.shaking.c:
 com.android.tools.r8.shaking.AnnotationRemover$Builder -> com.android.tools.r8.shaking.d$a:
     java.util.Set annotationsToRetain -> a
     java.util.Set classesToRetainInnerClassAttributeFor -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():346:346 -> <clinit>
-    1:7:void <init>():346:352 -> <init>
-    1:54:com.android.tools.r8.shaking.AnnotationRemover$Builder computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):358:411 -> a
-    55:55:com.android.tools.r8.shaking.AnnotationRemover$Builder setClassesToRetainInnerClassAttributeFor(java.util.Set):417:417 -> a
-    56:56:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):422:422 -> a
-    57:58:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):427:428 -> a
+    1:1:void <clinit>():350:350 -> <clinit>
+    1:7:void <init>():350:356 -> <init>
+    1:54:com.android.tools.r8.shaking.AnnotationRemover$Builder computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):362:415 -> a
+    55:55:com.android.tools.r8.shaking.AnnotationRemover$Builder setClassesToRetainInnerClassAttributeFor(java.util.Set):421:421 -> a
+    56:56:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):426:426 -> a
+    57:58:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):431:432 -> a
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.e:
     java.util.Set liveMethods -> s
     java.util.Set prunedTypes -> T
@@ -80898,37 +80938,38 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():64:64 -> b
     1:1:com.android.tools.r8.utils.DexVersion getDexVersion():68:68 -> c
     1:1:int getLevel():56:56 -> d
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):154:154 -> d
-    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):152:152 -> d
-    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):150:150 -> d
-    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):148:148 -> d
-    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):146:146 -> d
-    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):144:144 -> d
-    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):142:142 -> d
-    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):140:140 -> d
-    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):138:138 -> d
-    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):136:136 -> d
-    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):134:134 -> d
-    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):132:132 -> d
-    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):130:130 -> d
-    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):128:128 -> d
-    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):126:126 -> d
-    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):124:124 -> d
-    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):122:122 -> d
-    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):120:120 -> d
-    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):118:118 -> d
-    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):116:116 -> d
-    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):114:114 -> d
-    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):112:112 -> d
-    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):110:110 -> d
-    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):108:108 -> d
-    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):106:106 -> d
-    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):104:104 -> d
-    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):102:102 -> d
-    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):100:100 -> d
-    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):98:98 -> d
-    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):96:96 -> d
-    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):94:94 -> d
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):156:156 -> d
+    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):154:154 -> d
+    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):152:152 -> d
+    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):150:150 -> d
+    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):148:148 -> d
+    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):146:146 -> d
+    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):144:144 -> d
+    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):142:142 -> d
+    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):140:140 -> d
+    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):138:138 -> d
+    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):136:136 -> d
+    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):134:134 -> d
+    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):132:132 -> d
+    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):130:130 -> d
+    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):128:128 -> d
+    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):126:126 -> d
+    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):124:124 -> d
+    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):122:122 -> d
+    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):120:120 -> d
+    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):118:118 -> d
+    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):116:116 -> d
+    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):114:114 -> d
+    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):112:112 -> d
+    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):110:110 -> d
+    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):108:108 -> d
+    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):106:106 -> d
+    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):104:104 -> d
+    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):102:102 -> d
+    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):100:100 -> d
+    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):98:98 -> d
+    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):96:96 -> d
+    33:33:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):94:94 -> d
     1:1:com.android.tools.r8.utils.AndroidApiLevel[] values():12:12 -> e
 com.android.tools.r8.utils.AndroidApiLevel$1 -> com.android.tools.r8.utils.b$a:
     int[] $SwitchMap$com$android$tools$r8$utils$DexVersion -> a
@@ -81788,21 +81829,21 @@
     5:5:void <clinit>():12:12 -> <clinit>
     1:3:void <init>(java.lang.String,int,int,byte[]):22:24 -> <init>
     1:1:byte[] getBytes():32:32 -> a
-    2:38:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):40:76 -> a
-    39:39:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):74:74 -> a
-    40:40:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):50:50 -> a
-    41:41:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):47:47 -> a
-    42:42:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):44:44 -> a
-    43:43:java.util.Optional getDexVersion(char,char,char):99:99 -> a
-    44:44:java.util.Optional getDexVersion(char,char,char):97:97 -> a
+    2:39:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):40:77 -> a
+    40:40:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):75:75 -> a
+    41:41:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):51:51 -> a
+    42:42:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):48:48 -> a
+    43:43:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):45:45 -> a
+    44:44:java.util.Optional getDexVersion(char,char,char):100:100 -> a
+    45:45:java.util.Optional getDexVersion(char,char,char):98:98 -> a
     1:1:int getIntValue():28:28 -> b
     2:2:boolean matchesApiLevel(com.android.tools.r8.utils.AndroidApiLevel):36:36 -> b
     1:1:com.android.tools.r8.utils.DexVersion[] values():12:12 -> c
-    1:1:java.util.Optional getDexVersion(int):91:91 -> d
-    2:2:java.util.Optional getDexVersion(int):89:89 -> d
-    3:3:java.util.Optional getDexVersion(int):87:87 -> d
-    4:4:java.util.Optional getDexVersion(int):85:85 -> d
-    5:5:java.util.Optional getDexVersion(int):83:83 -> d
+    1:1:java.util.Optional getDexVersion(int):92:92 -> d
+    2:2:java.util.Optional getDexVersion(int):90:90 -> d
+    3:3:java.util.Optional getDexVersion(int):88:88 -> d
+    4:4:java.util.Optional getDexVersion(int):86:86 -> d
+    5:5:java.util.Optional getDexVersion(int):84:84 -> d
 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>
@@ -82270,13 +82311,13 @@
     7:7:void com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.disable():1167:1167 -> B
     7:7:void disableGlobalOptimizations():210 -> B
     8:16:void disableGlobalOptimizations():211:219 -> B
-    1:1:void disableNameReflectionOptimization():1389:1389 -> C
-    1:1:boolean enableBackportedMethodRewriting():1476:1476 -> D
+    1:1:void disableNameReflectionOptimization():1391:1391 -> C
+    1:1:boolean enableBackportedMethodRewriting():1478:1478 -> D
     1:6:void enableProtoShrinking():190:195 -> E
-    1:5:boolean enableTryWithResourcesDesugaring():1480:1484 -> F
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1468:1468 -> F
-    6:6:boolean enableTryWithResourcesDesugaring():1484 -> F
-    7:7:boolean enableTryWithResourcesDesugaring():1486:1486 -> F
+    1:5:boolean enableTryWithResourcesDesugaring():1482:1486 -> F
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1470:1470 -> F
+    6:6:boolean enableTryWithResourcesDesugaring():1486 -> F
+    7:7:boolean enableTryWithResourcesDesugaring():1488:1488 -> F
     1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():687:695 -> G
     1:9:java.util.Set getExtensiveLoggingFilter():674:682 -> H
     1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():399:399 -> I
@@ -82303,7 +82344,7 @@
     1:1:boolean isGeneratingDex():434 -> T
     2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():442:442 -> T
     2:2:boolean isGeneratingDex():434 -> T
-    1:6:boolean isInterfaceMethodDesugaringEnabled():1500:1505 -> U
+    1:6:boolean isInterfaceMethodDesugaringEnabled():1502:1507 -> U
     1:1:boolean isKeepAttributesSignatureEnabled():584:584 -> V
     1:3:boolean isMinifying():556:556 -> W
     5:5:boolean isMinifying():558:558 -> W
@@ -82340,38 +82381,38 @@
     83:83:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):927:927 -> a
     84:84:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):931:931 -> a
     85:90:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1035:1040 -> a
-    91:91:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1393:1393 -> a
-    92:92:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1422:1422 -> a
-    93:94:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():1427:1428 -> a
-    93:94:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1423 -> a
-    95:95:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1423:1423 -> a
-    1:1:boolean isStringSwitchConversionEnabled():1513:1513 -> a0
+    91:91:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1395:1395 -> a
+    92:92:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1424:1424 -> a
+    93:94:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():1429:1430 -> a
+    93:94:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1425 -> a
+    95:95:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1425:1425 -> a
+    1:1:boolean isStringSwitchConversionEnabled():1515:1515 -> a0
     1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():650:650 -> b
     2:35:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):825:858 -> b
     36:36:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):920:920 -> b
-    37:42:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1538:1543 -> b
+    37:42:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1540:1545 -> b
     1:2:boolean keepInnerClassStructure():602:603 -> b0
     1:1:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):911:911 -> c
-    2:2:boolean canHaveArtCheckCastVerifierBug():1851:1851 -> c
+    2:2:boolean canHaveArtCheckCastVerifierBug():1853:1853 -> c
     1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():662:662 -> c0
     1:10:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):938:947 -> d
     11:17:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):943:949 -> d
-    18:19:boolean canHaveArtInstanceOfVerifierBug():1806:1807 -> d
+    18:19:boolean canHaveArtInstanceOfVerifierBug():1808:1809 -> d
     1:32:boolean printWarnings():955:986 -> d0
     33:72:boolean printWarnings():982:1021 -> d0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1883:1883 -> e
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1885:1885 -> e
     1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():658:658 -> e0
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1875:1875 -> f
-    1:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1427:1428 -> f0
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1897:1897 -> g
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1877:1877 -> f
+    1:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1429:1430 -> f0
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1899:1899 -> g
     1:1:boolean shouldBackportMethods():419:419 -> g0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1553:1553 -> h
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1555:1555 -> h
     1:1:boolean com.android.tools.r8.utils.InternalOptions.enableExperimentalRecordDesugaring():493:493 -> h0
     1:1:boolean shouldDesugarRecords():497 -> h0
     2:2:boolean shouldDesugarRecords():500:500 -> h0
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1460:1460 -> h0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1462:1462 -> h0
     3:3:boolean shouldDesugarRecords():500 -> h0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1464:1464 -> i
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1466:1466 -> i
     1:1:boolean shouldKeepStackMapTable():423:423 -> i0
     2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():415:415 -> i0
     2:2:boolean shouldKeepStackMapTable():423 -> i0
@@ -82379,28 +82420,28 @@
     5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():415:415 -> i0
     5:5:boolean shouldKeepStackMapTable():425 -> i0
     6:6:boolean shouldKeepStackMapTable():426:426 -> i0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1534:1534 -> j
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1536:1536 -> j
     1:1:boolean shouldRerunEnqueuer():430:430 -> j0
-    1:1:boolean canUseConstantMethodHandle():1440:1440 -> k
+    1:1:boolean canUseConstantMethodHandle():1442:1442 -> k
     1:18:void signalFinishedToConsumers():466:483 -> k0
-    1:1:boolean canUseConstantMethodType():1444:1444 -> l
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1452:1452 -> m
-    1:2:boolean canUseFilledNewArrayOfObjects():1565:1566 -> n
+    1:1:boolean canUseConstantMethodType():1446:1446 -> l
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1454:1454 -> m
+    1:2:boolean canUseFilledNewArrayOfObjects():1567:1568 -> n
     1:1:boolean canUseInputStackMaps():607:607 -> o
-    1:1:boolean canUseInvokeCustom():1448:1448 -> p
-    1:1:boolean canUseInvokePolymorphic():1436:1436 -> q
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1432:1432 -> r
-    1:1:boolean canUseJavaUtilObjects():1522:1522 -> s
-    1:2:boolean canUseMultidex():1517:1518 -> t
-    1:1:boolean canUseNotInstruction():1601:1601 -> u
-    1:1:boolean canUsePrivateInterfaceMethods():1490:1490 -> v
-    1:1:boolean canUseRequireNonNull():1526:1526 -> w
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1574:1575 -> x
+    1:1:boolean canUseInvokeCustom():1450:1450 -> p
+    1:1:boolean canUseInvokePolymorphic():1438:1438 -> q
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1434:1434 -> r
+    1:1:boolean canUseJavaUtilObjects():1524:1524 -> s
+    1:2:boolean canUseMultidex():1519:1520 -> t
+    1:1:boolean canUseNotInstruction():1603:1603 -> u
+    1:1:boolean canUsePrivateInterfaceMethods():1492:1492 -> v
+    1:1:boolean canUseRequireNonNull():1528:1528 -> w
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1576:1577 -> x
     1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():666:666 -> y
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():126:126 -> z
 com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.pi$a:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():1480:1480 -> <clinit>
+    1:1:void <clinit>():1482:1482 -> <clinit>
 com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.pi$b:
     boolean enableConstantPropagation -> a
     boolean enableTypePropagation -> b
@@ -82505,6 +82546,7 @@
     boolean enableD8ResourcesPassThrough -> Y
     boolean invertConditionals -> z
     java.util.function.Consumer irModifier -> H
+    boolean enableExperimentalMapFileVersion -> l0
     java.util.function.Consumer callSiteOptimizationInfoInspector -> j0
     boolean measureProguardIfRuleEvaluations -> h0
     com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> i0
@@ -82539,7 +82581,7 @@
     boolean enableDeadSwitchCaseElimination -> t
     boolean forceNameReflectionOptimization -> F
     boolean dontCreateMarkerInD8 -> B
-    1:153:void <init>():1230:1382 -> <init>
+    1:155:void <init>():1230:1384 -> <init>
     void lambda$new$0(java.util.Deque) -> a
     1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1233:1233 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.pi$l$a:
@@ -82662,73 +82704,78 @@
     1:1:java.lang.String toString():39:39 -> toString
 com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.J:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():64:64 -> <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):64:64 -> 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):64:64 -> a
-    3:37: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
-    38:40:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):544:546 -> a
-    38: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):312 -> 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):316:316 -> a
-    42:60: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:333 -> a
-    61:75:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):466:480 -> a
-    61:75: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):333 -> a
-    76:76:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():568:568 -> a
-    76:76: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
-    76:76:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):480 -> a
-    76:76: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):333 -> a
-    77:77: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
-    77:77:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):480 -> a
-    77:77: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):333 -> a
-    78:94:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):484:500 -> a
-    78:94: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):333 -> a
-    95:114: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:356 -> a
-    115:115:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1495:1495 -> a
-    115:115: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):356 -> a
-    116:116: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):356:356 -> a
-    117:120:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):743:746 -> a
-    117:120: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):357 -> a
-    121:121:void com.android.tools.r8.utils.Pair.<init>():20:20 -> a
-    121:121:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):746 -> a
-    121: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):357 -> a
-    122:155:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):748:781 -> a
-    122:155: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):357 -> a
-    156:164:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):778:786 -> a
-    156:164: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):357 -> a
-    165:265: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):632:732 -> a
-    165:265: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):359 -> a
-    266:269:boolean verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):791:794 -> a
-    266:269: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):733 -> a
-    266:269: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):359 -> a
-    270: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):735:735 -> a
-    270: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):359 -> a
-    271:273: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):362:364 -> a
-    274:297:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):805:828 -> a
-    274:297: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):365 -> a
-    298:298:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):821:821 -> a
-    298:298: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):365 -> a
-    299:373: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):370:444 -> a
-    374:384: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):442:452 -> a
-    385: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):449:461 -> a
-    398:399: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
-    400:400: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
-    401:401:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):393:393 -> a
-    402:402:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):394:394 -> a
-    403:416:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):506:519 -> a
-    417:417:void sortMethods(java.util.List):528:528 -> a
-    418:419:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):530:531 -> a
-    420:420:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1461:1461 -> a
-    420:420:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):534 -> a
-    421:421: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):556:556 -> a
-    422:429:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):558:565 -> a
-    430:437:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):572:579 -> a
-    438:445:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):590:597 -> a
-    438:445:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):580 -> a
-    446:448:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):581:583 -> a
-    449:449:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):582:582 -> a
-    450:455:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):603:608 -> a
-    456:458:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):616:618 -> a
-    1:4:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):834:837 -> b
-    5:8:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):849:852 -> b
+    1:1:void <clinit>():66:66 -> <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):66:66 -> 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):66:66 -> a
+    3: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):273:308 -> a
+    39:39:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder() -> 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):308 -> a
+    40: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):308:311 -> a
+    44: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):309:312 -> 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):307:307 -> a
+    49:51:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):549:551 -> a
+    49:51:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):316 -> a
+    52:52:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):320:320 -> a
+    53:71: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
+    72:87:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):470:485 -> a
+    72:87: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
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():568:568 -> a
+    88:88: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
+    88:88:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):485 -> a
+    88: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):337 -> 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):162:162 -> a
+    89:89:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):485 -> 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):337 -> a
+    90:106:boolean verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):489:505 -> a
+    90:106:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):337 -> a
+    107: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):341:360 -> a
+    127:127:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1497:1497 -> a
+    127: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):360 -> 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):360:360 -> a
+    129:132:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):748:751 -> a
+    129:132: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
+    133:133:void com.android.tools.r8.utils.Pair.<init>():20:20 -> a
+    133:133:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):751 -> a
+    133: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):361 -> a
+    134:167:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):753:786 -> a
+    134:167: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
+    168:176:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):783:791 -> a
+    168:176: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
+    177:277: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):637:737 -> a
+    177:277: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
+    278:281:boolean verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):796:799 -> a
+    278:281: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):738 -> a
+    278:281: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
+    282: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):740:740 -> a
+    282: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):363 -> a
+    283:285: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
+    286:309:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):810:833 -> a
+    286:309: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
+    310: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):826:826 -> a
+    310: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):369 -> a
+    311:385: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:448 -> a
+    386:396: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):446:456 -> a
+    397:409: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):453:465 -> a
+    410:411: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:292 -> a
+    412: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):290:290 -> a
+    413:413:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):397:397 -> a
+    414:414:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):398:398 -> a
+    415:428:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):511:524 -> a
+    429:429:void sortMethods(java.util.List):533:533 -> a
+    430:431:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):535:536 -> a
+    432:432:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1461:1461 -> a
+    432:432:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):539 -> a
+    433:433: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):561:561 -> a
+    434:441:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):563:570 -> a
+    442:449:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):577:584 -> a
+    450:457:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):595:602 -> a
+    450:457:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):585 -> a
+    458:460:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):586:588 -> a
+    461:461:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):587:587 -> a
+    462:467:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):608:613 -> a
+    468:470:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):621:623 -> a
+    1:4:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):839:842 -> b
+    5:8:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):854:857 -> b
 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
@@ -82737,30 +82784,30 @@
     java.util.List val$mappedPositions -> j
     int emittedPc -> g
     java.util.List val$processedEvents -> l
-    1:1:void <clinit>():649:649 -> <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):649:652 -> <init>
-    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):665:678 -> a
-    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):687:687 -> a
-    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):692:692 -> a
-    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):697:697 -> a
-    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):704:705 -> a
-    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):710:711 -> a
-    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):716:717 -> a
-    1:3:void flushPc():656:658 -> f
+    1:1:void <clinit>():654:654 -> <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):654:657 -> <init>
+    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):670:683 -> a
+    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):692:692 -> a
+    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):697:697 -> a
+    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):702:702 -> a
+    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):709:710 -> a
+    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):715:716 -> a
+    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):721:722 -> a
+    1:3:void flushPc():661:663 -> 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>():749:749 -> <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):749:749 -> <init>
-    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):752:758 -> a
-    8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):755:768 -> a
-    22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):763:763 -> a
+    1:1:void <clinit>():754:754 -> <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):754:754 -> <init>
+    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):757:763 -> a
+    8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):760:773 -> a
+    22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):768:768 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.D:
-    1:1:void <init>():72:72 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):72:72 -> <init>
-    1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):76:76 -> a
+    1:1:void <init>():74:74 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):74:74 -> <init>
+    1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):78:78 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.E:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
@@ -82770,44 +82817,44 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper baseRemapper -> e
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> f
-    1:1:void <clinit>():113:113 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):113:113 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):128:128 -> <init>
-    3:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):117:132 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod access$202(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):113:113 -> a
-    2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):137:139 -> a
-    5:17:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):185:197 -> a
-    5:17:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):139 -> a
-    18:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):189:189 -> a
-    18:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):139 -> a
-    19:35:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):141:157 -> a
+    1:1:void <clinit>():115:115 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):115:115 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):130:130 -> <init>
+    3:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):119:134 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$202(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):115:115 -> a
+    2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):139:141 -> a
+    5:17:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):187:199 -> a
+    5:17:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):141 -> a
+    18:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):191:191 -> a
+    18:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):141 -> a
+    19:35:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):143:159 -> a
     36:38:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getName(java.lang.String):74:76 -> a
-    36:38:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):158 -> a
+    36:38:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):160 -> a
     39:41:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getDescriptor(java.lang.String):80:82 -> a
-    39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):159 -> a
-    42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):160:170 -> a
-    53:67:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):167:181 -> a
+    39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):161 -> a
+    42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):162:172 -> a
+    53:67:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):169:183 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.F:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.utils.LineNumberOptimizer$1):252:252 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int):259:263 -> <init>
-    1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):252:252 -> a
-    1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):252:252 -> b
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):252:252 -> c
-    1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):252:252 -> d
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.utils.LineNumberOptimizer$1):254:254 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int):261:265 -> <init>
+    1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):254:254 -> a
+    1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):254:254 -> b
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):254:254 -> c
+    1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):254:254 -> d
 com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.G:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
     int previousSourceLine -> c
     int maxLineDelta -> a
-    1:1:void <clinit>():80:80 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):86:86 -> <init>
-    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):82:90 -> <init>
-    1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):95:109 -> a
+    1:1:void <clinit>():82:82 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):88:88 -> <init>
+    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):84:92 -> <init>
+    1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):97:111 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.H:
     java.util.List processedEvents -> f
     int previousPc -> d
@@ -82816,16 +82863,16 @@
     com.android.tools.r8.graph.DexMethod method -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.ir.code.Position previousPosition -> e
-    1:1:void <clinit>():208:208 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):208:208 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):217:217 -> <init>
-    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):210:220 -> <init>
-    1:2:void emitAdvancePc(int):224:225 -> a
-    1:2:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):208 -> a
-    3:16:void emitPositionEvents(int,com.android.tools.r8.ir.code.Position):229:242 -> a
-    3:16:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):208 -> a
-    17:18:int getStartLine():246:247 -> a
-    17:18:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):208 -> a
+    1:1:void <clinit>():210:210 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):210:210 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):219:219 -> <init>
+    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):212:222 -> <init>
+    1:2:void emitAdvancePc(int):226:227 -> a
+    1:2:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):210 -> a
+    3:16:void emitPositionEvents(int,com.android.tools.r8.ir.code.Position):231:244 -> a
+    3:16:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):210 -> a
+    17:18:int getStartLine():248:249 -> a
+    17:18:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):210 -> 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.So: